diff --git a/contrib/build-server/README.txt b/contrib/build-server/README.txt
deleted file mode 100644
index d72273d463..0000000000
--- a/contrib/build-server/README.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-This is a collection of scripts that we use on the OMPI build server
-to make official and nightly tarballs.  I'm putting them in SVN
-because it occurs to me that these scripts *only* live on the local
-disk of eddie.osl.iu.edu; if that disk should ever fail, we'd be
-totally hosed!
-
-I unfortunately don't have time to fully document all of these scripts
-at the moment, so this brief README will have to do for now.
-
-- install-autotools-set.sh: a script to install a new set of (GNU
-  autotools + Flex) in $HOME/local.  There's many manual steps here,
-  and every time we do it by hand, we screw it up.  Hence, this script
-  automates the whole process.
-
-  Note that this script also creates a modulefile in
-  $HOME/modules/autotools corresponding to the set of tools that was
-  just adjusted.
-
-  Modulefiles are assumed by several of the scripts below; you need to
-  go to $HOME/modules/autotools and make a sym link from
-  "ompi-<branch_name>" to the modulefile you want (e.g., ompi-trunk,
-  ompi-1.7, hwloc-1.5, ...etc.).  The scripts below do something like
-  this:
-
-  module use $HOME/modules
-  module load autotools/ompi-$branchname
-  ./autogen.pl
-  # ...etc.
-
-- crontab.txt: the cron jobs that are running as "mpiteam" on
-  mtt.open-mpi.org as of 1 Oct 2014.  They show the CLI options to
-  several of these scripts.
-
-- openmpi-nightly-tarball.sh: script used to make the nightly tarballs
-  and copy them to the live web tree
-
-- openmpi-update-www.open-mpi.org.sh: this is the script fired by
-  cron to basically run "git pull" on the live www.open-mpi.org web
-  site, in local directory /l/osl/www/www.open-mpi.org (this is a
-  network mount, actually)
-
-- openmpi-release.sh: use this script to make official Open MPI
-  tarball releases.  Give it the path in the OMPI SVN repo to make the
-  tarball from.  For example:
-
-     ./openmpi-release trunk
-     or
-     ./openmpi-release branches/v1.6
-
-- hwloc-nightly-tarball.sh: just like openmpi-nightly-tarball.sh, but
-  for hwloc.
-
-- hwloc-release.sh: just like openmpi-release.sh, but for hwloc.
-
-- remove-old.pl: when a nightly tarball fails, the script leaves the
-  broken tree around for a human to examine.  This script prunes any
-  of these old directories.  It's set to fire by
-  openmpi-nightly-tarball.sh, and removes any busted nightly build
-  directories older than 28 days.
diff --git a/contrib/build-server/crontab.txt b/contrib/build-server/crontab.txt
deleted file mode 100644
index cbfe2cb208..0000000000
--- a/contrib/build-server/crontab.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-#########################
-# MPI Testing Tool (MTT)
-#  - Original plan
-#
-# Everyday
-#  - 23:00 -  1:00  Update MTT Statistics [Database]
-#  -  1:00 -  3:00  Update MTT Statistics [Contribution]
-#  -  3:00 -  3:05  Update Contrib Graph
-#  -  4:00 -  4:30  Maintain internal PostgreSQL stats (Day)
-#  -  4:30 -  8:30  Update Static MTT Visualization Extension (Disabled due to heavy load)
-#
-# Saturday
-#  -  1:00 - 12:00  Backup the MTT database
-#  - 14:30 - 18:30  Update Static MTT Visualization Extension
-#
-# Sunday
-#  -  4:00 -  4:30  Maintain internal PostgreSQL stats (Week)
-#  -  4:00 -  4:30  Maintain internal PostgreSQL stats (Month) [1st sunday only]
-#  -  5:00 -  5:30  Check for Integrity Violations (week)
-#
-#########################
-
-
-#########################
-# Update MTT Statistics [Database]
-#  - everyday at 11:00
-#  - runs in about 25 - 30  min
-#########################
-0 23 * * *  /l/osl/www/mtt.open-mpi.org/cron/mtt-update-stats-db-only.pl
-
-#########################
-# Update MTT Statistics [Contribution]
-#  - everyday at 1 am
-#  - runs in about 2 hours
-#########################
-0 1 * * *  /l/osl/www/mtt.open-mpi.org/cron/mtt-update-stats.pl
-
-#########################
-# Update Contrib Graphs
-# - 3 am Everyday
-# - Runs in < 1 min
-# "-l" limits to just last year of data. (slightly faster to run)
-#########################
-0 3 * * * /l/osl/www/mtt.open-mpi.org/cron/create-contrib-graph.pl -l
-30 3 * * * /l/osl/www/mtt.open-mpi.org/cron/create-contrib-graph.pl
-
-
-
-#########################
-# Maintain internal PostgreSQL stats (Week)
-#  - Sunday at 4 am (except when Monthly is running)
-#  - runs in about 30 min
-# JJH: 11/7/2011 - Since Monthly disabled, run every week
-#########################
-##0 4 * * 0  if [ `date +\%d` -ge 8 ]; then /l/osl/www/mtt.open-mpi.org/cron/periodic-maintenance.pl -week 1> /dev/null 2> /dev/null; fi
-0 4 * * 0  /l/osl/www/mtt.open-mpi.org/cron/periodic-maintenance.pl -week 1> /dev/null 2> /dev/null
-
-#########################
-# Maintain internal PostgreSQL stats (Year)
-#  - Dec. 1 at 4 am
-#  - runs in about 6 hours (?? Verify)
-#########################
-0 4 1 12 *  /l/osl/www/mtt.open-mpi.org/cron/periodic-maintenance.pl -year 1> /dev/null 2> /dev/null
-
-
-#########################
-# Email Reports
-#  - Tues - Thursday at 9 am (Past 12 hours)
-#  - Tues - Thursday at 9 pm (Past 24 hours)
-#  - Monday at 9 am (Past 60 hours)
-#########################
-0 9 * * 2-4  /l/osl/www/mtt.open-mpi.org/cron/alerts.php -f /l/osl/www/mtt.open-mpi.org/cron/morning.ini 1> /dev/null 2> /dev/null
-0 21 * * 2-4 /l/osl/www/mtt.open-mpi.org/cron/alerts.php -f /l/osl/www/mtt.open-mpi.org/cron/evening.ini 1> /dev/null 2> /dev/null
-0 9 * * 1    /l/osl/www/mtt.open-mpi.org/cron/alerts.php -f /l/osl/www/mtt.open-mpi.org/cron/monday.ini  1> /dev/null 2> /dev/null
-
-
-
-#######################################################################
-# Build nightly tarballs
-#######################################################################
-0 21 * * * $HOME/scripts/netloc-nightly-tarball.sh </dev/null >/dev/null 2>&1
-1 21 * * * $HOME/scripts/hwloc-nightly-tarball.sh </dev/null >/dev/null 2>&1
-5 21 * * * $HOME/scripts/openmpi-nightly-tarball.sh </dev/null >/dev/null 2>&1
-
-
-#######################################################################
-# Update web sites
-#######################################################################
-*/15 * * * * $HOME/scripts/openmpi-update-www.open-mpi.org.sh < /dev/null > $HOME/tmp/git-www-ompi.log 2>&1
-*/10 * * * * $HOME/scripts/forum-update-meetings.mpi-forum.org.sh  < /dev/null > $HOME/tmp/svn-up-forum.log 2>&1
-
-
-#=====================================================================
-#=====================================================================
-# Outdated / unused scripts
-#=====================================================================
-#=====================================================================
-
-#########################
-# Maintain internal PostgreSQL stats (Day)
-#  - every weekday at 4 am
-#  - runs in about 10 - 20 min
-#
-# JJH: 12/20/2011 Disable this to try to help with memory issues in the db
-#########################
-#0 4 * * 1-5  /l/osl/www/mtt.open-mpi.org/cron/periodic-maintenance.pl -day 1> /dev/null 2> /dev/null
-
-#########################
-# Maintain internal PostgreSQL stats (Month)
-#  - 1st Sunday of the Month at 4 am
-#  - runs in about 21 hours (not 20 min)
-# JJH: 11/7/2011 - Disabled due to long runtime causing submission errors
-#########################
-#0 4 * * 0  if [ `date +\%d` -lt 8 ]; then /l/osl/www/mtt.open-mpi.org/cron/periodic-maintenance.pl -month 1> /dev/null 2> /dev/null; fi
-
-#30 20 * * * $HOME/scripts/openmpi-nightly-tmpbranch-tarball.sh </dev/null >/dev/null 2>&1
-#0 0 * * * $HOME/scripts/openmpi-ft-cr-tarball.sh </dev/null >/dev/null 2>&1
-
-# Don't build any more LAM/MPI tarballs!
-#0 4 * * * $HOME/scripts/lammpi-nightly-tarball.sh </dev/null >/dev/null 2>&1
-
-# As of 15 Sep 2014, we're 100% Gitdub.  Leaving this (commented out) entry for
-# the time being, just in case gitdub implodes, and we need a hint on how to go
-# back to the old way.
-#*/5 * * * * /u/mpiteam/scripts/github-send-commit-mails.pl /u/mpiteam/git/hwloc-debian /u/mpiteam/git/docs /u/mpiteam/git/ompi-www /u/mpiteam/git/orcm /u/mpiteam/git/mtt
-# Removed: /u/mpiteam/git/scon (defunct)
-# Removed: /u/mpiteam/git/netloc (now using gitdub)
-
-# Keep OMPI svn:ignore properties in sync with .gitignore_global and
-# .hgignore_global
-# Oct 2014: once we switched to GitHub, this was no longer necessary.
-#0 1 * * * $HOME/scripts/openmpi-nightly-githgignore.sh
diff --git a/contrib/build-server/hwloc-release.sh b/contrib/build-server/hwloc-release.sh
deleted file mode 100755
index a9ac8f0636..0000000000
--- a/contrib/build-server/hwloc-release.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh -x
-
-# The tarballs to make
-#dirs="/branches/v1.2 /branches/v1.1 /branches/v1.0 /trunk"
-
-# The tarballs to make
-if [ $# -eq 0 ] ; then
-  echo "Must specify which SVN branch to create (e.g., branches/v0.9)"
-  exit 1
-fi
-dirs=$@
-
-# Build root - scratch space
-build_root=/home/mpiteam/hwloc/release/
-
-# Script to execute
-script=contrib/dist/make_dist_tarball
-
-export PATH=$HOME/local/bin:$PATH
-export LD_LIBRARY_PATH=$HOME/local/lib:$LD_LIBRARY_PATH
-
-#####
-#
-# Actually do stuff
-#
-#####
-
-# load the modules configuration
-. /etc/profile.d/modules.sh
-module use ~/modules
-
-# move to the directory
-# Loop making them
-for dir in $dirs; do
-        ver=`basename $dir`
-
-        cd $build_root/$ver
-
-        module load "autotools/hwloc-$ver"
-        module load "tex-live/hwloc-$ver"
-
-        ./$script $@ >dist.out 2>&1
-
-        module unload autotools tex-live
-done
diff --git a/contrib/build-server/install-autotools-set.sh b/contrib/build-server/install-autotools-set.sh
deleted file mode 100755
index abf482258a..0000000000
--- a/contrib/build-server/install-autotools-set.sh
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/sh -f
-
-#
-# This script installs specific versions of a quad of (GNU autotools + flex)
-# to be used on the OMPI build server to make official Open MPI tarballs.
-# We put this into a script because if a human performs this manually,
-# they will inevitably forget one of the manual steps (e.g., making the
-# modulefile, or installing flex, or ...).
-#
-
-m4=1.4.16
-ac=2.69
-am=1.13.4
-lt=2.4.2
-flex=2.5.35
-
-getgnu() {
-    tarball=$1
-    url_prefix=$2
-
-
-}
-
-doit() {
-    tarball=$1
-    url_prefix=$2
-    url_suffix=$3
-    directory=$4
-    prefix=$5
-
-    if test ! -r $HOME/local/$tarball; then
-        echo "+++ Downloading $tarball"
-        echo wget $url_prefix/$tarball$url_suffix -O $HOME/local/$tarball
-        wget $url_prefix/$tarball$url_suffix -O $HOME/local/$tarball
-    else
-        echo "--- No need to download $tarball"
-    fi
-    status=$?
-
-    if test ! -r $HOME/local/$tarball -o "$status" != "0"; then
-        echo "--- Download of $tarball failed!"
-        exit 1
-    fi
-
-    if test "`echo $tarball | egrep 'bz2$'`" != ""; then
-        options=jxf
-    elif test "`echo $tarball | egrep 'gz$'`" != ""; then
-        options=zxf
-    else
-        echo "--- Don't know how to extract $tarball"
-        exit 1
-    fi
-
-    echo "+++ Extracting $tarball"
-    cd $prefix/src
-    rm -rf $directory
-    tar $options $HOME/local/$tarball
-    if test ! -d $directory; then
-        echo "--- Extraction failed!"
-        exit 1
-    fi
-
-    echo "+++ Configuring"
-    cd $directory
-    ./configure --prefix=$prefix 2>&1 | tee config.out
-    if test "$?" != "0" -o ! -f Makefile; then
-        echo "--- configure failed!"
-        exit 1
-    fi
-
-    echo "+++ Building / installing"
-    make -j 4 install 2>&1 | tee make.out
-    if test "$?" != "0"; then
-        echo "--- make failed!"
-        exit 1
-    fi
-}
-
-#-----------------------------------------------------------------------------
-
-# Make the base directory where this set of autotools will go
-
-basedir=$HOME/local
-thisdir=$basedir/autotools-$ac-$am-$lt-$m4
-if test -d "$thisdir"; then
-    echo "=== Removing pre-existing $thisdir..."
-    rm -rf $thisdir
-fi
-mkdir -p $thisdir/src
-cd $thisdir/src
-
-#-----------------------------------------------------------------------------
-
-# Add this directory to the PATH so that each tool will see its
-# already-installed friends.
-
-export PATH=$thisdir/bin:$PATH
-
-#-----------------------------------------------------------------------------
-
-# Install everything
-
-doit m4-$m4.tar.bz2       ftp://ftp.gnu.org/gnu/m4       "" m4-$m4       $thisdir
-doit autoconf-$ac.tar.gz  ftp://ftp.gnu.org/gnu/autoconf "" autoconf-$ac $thisdir
-doit automake-$am.tar.gz  ftp://ftp.gnu.org/gnu/automake "" automake-$am $thisdir
-doit libtool-$lt.tar.gz   ftp://ftp.gnu.org/gnu/libtool  "" libtool-$lt  $thisdir
-
-doit flex-$flex.tar.bz2   http://prdownloads.sourceforge.net/flex '?download' flex-$flex $thisdir
-
-#-----------------------------------------------------------------------------
-
-# Make the modulefile
-
-echo "+++ Creating modulefile"
-moddir=$HOME/modules/autotools
-mkdir -p $moddir
-
-mod=$moddir/autotools-$ac-$am-$lt-$m4
-rm -f $mod
-cat > $mod <<EOF
-#%Module 0.0 -*- tcl -*-
-#
-# Setup home-brew autotools
-
-proc ModulesHelp { } {
-    puts stderr "Load Autotools with versions:"
-    puts stderr "\tm4 $m4"
-    puts stderr "\tAutoconf $ac"
-    puts stderr "\tAutomake $am"
-    puts stderr "\tLibtool $lt"
-    puts stderr "\tFlex $flex"
-}
-
-module-whatis  "Load Autotools (ac $ac, am $am, lt $lt, m4 $m4, and flex $flex)"
-
-eval set  [ array get env HOME ]
-set AUTOTOOLS "$thisdir"
-setenv AUTOTOOLS \$AUTOTOOLS
-
-prepend-path PATH \$AUTOTOOLS/bin
-prepend-path MANPATH \$AUTOTOOLS/man
-EOF
-
-#-----------------------------------------------------------------------------
-
-# All done!
-
-echo "Autotools installed (AC $ac, AM $am, LT $lt, m4 $m4, Flex $flex)"
-exit 0
diff --git a/contrib/build-server/openmpi-release.sh b/contrib/build-server/openmpi-release.sh
deleted file mode 100755
index a01f985dbe..0000000000
--- a/contrib/build-server/openmpi-release.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh -x
-
-# The tarballs to make
-if [ $# -eq 0 ] ; then
-    branches="v1.8"
-else
-    branches=$1
-    shift
-fi
-
-# Build root - scratch space
-build_root=/home/mpiteam/openmpi/release/
-
-# Script to execute
-script=contrib/dist/make_dist_tarball
-
-export PATH=$HOME/local/bin:$PATH
-export LD_LIBRARY_PATH=$HOME/local/lib:$LD_LIBRARY_PATH
-
-#####
-#
-# Actually do stuff
-#
-#####
-
-# load the modules configuration
-. /etc/profile.d/modules.sh
-module use ~/modules
-
-# move to the directory
-# Loop making them
-for branch in $branches; do
-    cd $build_root/$branch
-
-    module load "autotools/ompi-$branch"
-
-    ./$script $@ >dist.out 2>&1
-	if test "$?" != "0"; then
-		cat <<EOF
-=============================================================================
-== Dist failure
-== Last few lines of output (full results in dist.out file):
-=============================================================================
-EOF
-		tail -n 20 dist.out
-		exit 1
-	fi
-
-    module unload "autotools"
-done
diff --git a/contrib/build-server/openmpi-update-www.open-mpi.org.sh b/contrib/build-server/openmpi-update-www.open-mpi.org.sh
deleted file mode 100755
index 89b39833cf..0000000000
--- a/contrib/build-server/openmpi-update-www.open-mpi.org.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-cd /l/osl/www/www.open-mpi.org
-
-# Absolutely ensure that we have a umask of 2 so that others can
-# run "svn up" in this tree, too
-umask 2
-
-svn up
-
-date >> /tmp/bogus-mpiteam
diff --git a/contrib/build-server/pmix-release.sh b/contrib/build-server/pmix-release.sh
deleted file mode 100755
index ec64d5522f..0000000000
--- a/contrib/build-server/pmix-release.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh -x
-
-# The tarballs to make
-if [ $# -eq 0 ] ; then
-    branches="v1.0"
-else
-    branches=$1
-    shift
-fi
-
-# Build root - scratch space
-build_root=/home/mpiteam/pmix/release
-
-# Script to execute
-script=contrib/make_dist_tarball
-
-export PATH=$HOME/local/bin:$PATH
-export LD_LIBRARY_PATH=$HOME/local/lib:$LD_LIBRARY_PATH
-
-#####
-#
-# Actually do stuff
-#
-#####
-
-# load the modules configuration
-. /etc/profile.d/modules.sh
-module use ~/modules
-
-# move to the directory
-# Loop making them
-for branch in $branches; do
-    cd $build_root/$branch
-
-    module load "autotools/pmix-$branch"
-    module load libevent/pmix-$branch
-
-    ./$script $@ >dist.out 2>&1
-	if test "$?" != "0"; then
-		cat <<EOF
-=============================================================================
-== Dist failure
-== Last few lines of output (full results in dist.out file):
-=============================================================================
-EOF
-		tail -n 20 dist.out
-		exit 1
-	fi
-
-    module unload libevent
-    module unload autotools
-done
diff --git a/contrib/infrastructure/README-setup-github-diff-emails.txt b/contrib/infrastructure/README-setup-github-diff-emails.txt
deleted file mode 100644
index c5ad447722..0000000000
--- a/contrib/infrastructure/README-setup-github-diff-emails.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-When creating the github email hook thingy...
-
-First, clone down the repo from github that you want:
-
-  cd /u/mpiteam/git
-  git clone ...
-
-The rest of these instructions assume that you cloned into directory "foo".
-Change "foo" as appropriate for your repo name.
-
-Make a bare clone of your new clone:
-
-  git clone --bare foo foo.git
-
-In the non-bare repo, add a remote named "email" that is the bare repo:
-
-  cd foo
-  git remote add email /u/mpiteam/git/foo.git
-
-Now in the foo repo, edit the config and in the remote "origin" section, add
-the following line if it's not already there:
-
-  emacs .git/config
-  # Add this line in the "origin" section:
-
-	fetch = +refs/heads/*:refs/remotes/origin/*
-
-Still in that same config file, add a line in the remote "email" section:
-
-	push = +refs/remotes/origin/*:refs/heads/*
-
-Now exit the editor and remove the tracking branch of the origin:
-
-    git branch -d -r origin/HEAD
-
-IF YOU SCREW UP AND "push" to the email remote before deleting the origin/HEAD
-tracking branch, then run the "git branch -d ..." and the following (both in
-the original repo, not the bare repo):
-
-    git push email :refs/heads/HEAD
-
-Copy the hooks/post-receive script from any of the other bare repos to the
-hooks subdir in this bare repo (e.g., from
-/u/mpiteam/git/hwloc.git/hooks/post-receive).  Ensure that this script is
-executable.
-
-Edit the file named "description" in the bare repo and put a 1-word name of the
-project in the file (this word will be used in the email subject).
-
-Now in the bare repo, add the following "[hooks]" section -- MAKE SURE TO USE
-THE CORRECT URL FOR YOUR GITHUB REPO, and set the email address properly:
-
-[hooks]
-    emailprefix = "GIT: "
-    mailinglist = netloc-commits@open-mpi.org
-    diffopts = --stat --summary --find-copies-harder
-    emailmaxlines = 5000
-    showrev="t=%s; printf https://github.com/open-mpi/netloc/commit/$t; echo; echo; git show --stat --patch -C $t; echo"
diff --git a/contrib/infrastructure/README.txt b/contrib/infrastructure/README.txt
deleted file mode 100644
index 0b8e994c45..0000000000
--- a/contrib/infrastructure/README.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-There are several files and scripts in this directory.
-
-- Crontab for jaguar.crest.iu.edu (aka mtt.open-mpi.org, where much
-  nightly processing for the Open MPI project occurs).
-
-- Crontab for lion.crest.iu.edu (aka www.open-mpi.org, which you can't
-  directly SSH login to from outside of iu.edu).
-
-- Script used to send diff emails from github repos (because github
-  refuses to send diff emails).  This script is fired from cron.
-
-- README for how to setup diff emails for new github repos (i.e., how
-  to use the above script to send diff emails for each github repo).
-
-- Script that is run on lion.crest.iu.edu (aka www.open-mpi.org) to
-  update the bitbucket mercurial mirror.  It is run via cron every 15
-  minutes.
-
---> Note that the github SVN mirroring of the main OMPI SVN repo (ompi)
-    is maintained by Mellanox.  Its script does not currently appear
-    here in the SVN repo.
diff --git a/contrib/infrastructure/crontab-mpiteam-at-jaguar.crest.iu.edu.txt b/contrib/infrastructure/crontab-mpiteam-at-jaguar.crest.iu.edu.txt
deleted file mode 100644
index f8328db937..0000000000
--- a/contrib/infrastructure/crontab-mpiteam-at-jaguar.crest.iu.edu.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-#########################
-# MPI Testing Tool (MTT)
-#  - Original plan
-#
-# Everyday
-#  - 23:00 -  1:00  Update MTT Statistics [Database]
-#  -  1:00 -  3:00  Update MTT Statistics [Contribution]
-#  -  3:00 -  3:05  Update Contrib Graph
-#  -  4:00 -  4:30  Maintain internal PostgreSQL stats (Day)
-#  -  4:30 -  8:30  Update Static MTT Visualization Extension (Disabled due to heavy load)
-#
-# Saturday
-#  -  1:00 - 12:00  Backup the MTT database
-#  - 14:30 - 18:30  Update Static MTT Visualization Extension
-#
-# Sunday
-#  -  4:00 -  4:30  Maintain internal PostgreSQL stats (Week)
-#  -  4:00 -  4:30  Maintain internal PostgreSQL stats (Month) [1st sunday only]
-#  -  5:00 -  5:30  Check for Integrity Violations (week)
-#
-#########################
-
-
-#########################
-# Update MTT Statistics [Database]
-#  - everyday at 11:00
-#  - runs in about 25 - 30  min
-#########################
-0 23 * * *  /l/osl/www/mtt.open-mpi.org/cron/mtt-update-stats-db-only.pl
-
-#########################
-# Update MTT Statistics [Contribution]
-#  - everyday at 1 am
-#  - runs in about 2 hours
-#########################
-0 1 * * *  /l/osl/www/mtt.open-mpi.org/cron/mtt-update-stats.pl
-
-#########################
-# Update Contrib Graphs
-# - 3 am Everyday
-# - Runs in < 1 min
-# "-l" limits to just last year of data. (slightly faster to run)
-#########################
-0 3 * * * /l/osl/www/mtt.open-mpi.org/cron/create-contrib-graph.pl -l
-30 3 * * * /l/osl/www/mtt.open-mpi.org/cron/create-contrib-graph.pl
-
-
-
-#########################
-# Maintain internal PostgreSQL stats (Week)
-#  - Sunday at 4 am (except when Monthly is running)
-#  - runs in about 30 min
-# JJH: 11/7/2011 - Since Monthly disabled, run every week
-#########################
-##0 4 * * 0  if [ `date +\%d` -ge 8 ]; then /l/osl/www/mtt.open-mpi.org/cron/periodic-maintenance.pl -week 1> /dev/null 2> /dev/null; fi
-0 4 * * 0  /l/osl/www/mtt.open-mpi.org/cron/periodic-maintenance.pl -week 1> /dev/null 2> /dev/null
-
-#########################
-# Maintain internal PostgreSQL stats (Year)
-#  - Dec. 1 at 4 am
-#  - runs in about 6 hours (?? Verify)
-#########################
-0 4 1 12 *  /l/osl/www/mtt.open-mpi.org/cron/periodic-maintenance.pl -year 1> /dev/null 2> /dev/null
-
-
-#########################
-# Email Reports
-#  - Tues - Thursday at 9 am (Past 12 hours)
-#  - Tues - Thursday at 9 pm (Past 24 hours)
-#  - Monday at 9 am (Past 60 hours)
-#########################
-0 9 * * 2-4  /l/osl/www/mtt.open-mpi.org/cron/alerts.php -f /l/osl/www/mtt.open-mpi.org/cron/morning.ini 1> /dev/null 2> /dev/null
-0 21 * * 2-4 /l/osl/www/mtt.open-mpi.org/cron/alerts.php -f /l/osl/www/mtt.open-mpi.org/cron/evening.ini 1> /dev/null 2> /dev/null
-0 9 * * 1    /l/osl/www/mtt.open-mpi.org/cron/alerts.php -f /l/osl/www/mtt.open-mpi.org/cron/monday.ini  1> /dev/null 2> /dev/null
-
-
-
-#######################################################################
-# Build nightly tarballs
-#######################################################################
-1 21 * * * $HOME/scripts/hwloc-nightly-tarball.sh </dev/null >/dev/null 2>&1
-5 21 * * * $HOME/scripts/openmpi-nightly-tarball.sh </dev/null >/dev/null 2>&1
-
-
-#######################################################################
-# Update web sites
-#######################################################################
-*/15 * * * * $HOME/scripts/openmpi-update-www.open-mpi.org.sh < /dev/null > $HOME/tmp/git-www-ompi.log 2>&1
-*/10 * * * * $HOME/scripts/forum-update-meetings.mpi-forum.org.sh  < /dev/null > $HOME/tmp/svn-up-forum.log 2>&1
-
-
-#=====================================================================
-#=====================================================================
-# Outdated / unused scripts
-#=====================================================================
-#=====================================================================
-
-#########################
-# Maintain internal PostgreSQL stats (Day)
-#  - every weekday at 4 am
-#  - runs in about 10 - 20 min
-#
-# JJH: 12/20/2011 Disable this to try to help with memory issues in the db
-#########################
-#0 4 * * 1-5  /l/osl/www/mtt.open-mpi.org/cron/periodic-maintenance.pl -day 1> /dev/null 2> /dev/null
-
-#########################
-# Maintain internal PostgreSQL stats (Month)
-#  - 1st Sunday of the Month at 4 am
-#  - runs in about 21 hours (not 20 min)
-# JJH: 11/7/2011 - Disabled due to long runtime causing submission errors
-#########################
-#0 4 * * 0  if [ `date +\%d` -lt 8 ]; then /l/osl/www/mtt.open-mpi.org/cron/periodic-maintenance.pl -month 1> /dev/null 2> /dev/null; fi
diff --git a/contrib/infrastructure/crontab-mpiteam-at-lion.crest.iu.edu b/contrib/infrastructure/crontab-mpiteam-at-lion.crest.iu.edu
deleted file mode 100644
index ce10cc1d2b..0000000000
--- a/contrib/infrastructure/crontab-mpiteam-at-lion.crest.iu.edu
+++ /dev/null
@@ -1,17 +0,0 @@
-#########################
-# Update the OSL FT webpage
-#
-# Everyday @ 1:00 am
-#
-0 1 * * * (cd /l/osl/www/www.osl.iu.edu/research/ft && svn up ) 1> /dev/null 2> /dev/null
-#########################
-
-
-##########################
-# Official Open MPI repo mirrors
-##########################
-#
-#
-# Update the ompi hg repository
-#
-10,25,40,55 * * * * /home/ompi-hg/update-hg-svn.sh
diff --git a/contrib/infrastructure/gitdub-config.yml b/contrib/infrastructure/gitdub-config.yml
deleted file mode 100644
index 7f42bcde6a..0000000000
--- a/contrib/infrastructure/gitdub-config.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-gitdub:
-  # The directory where gitdub keeps its per-repository state.
-  directory: .gitdub
-
-  # Bind to all addresses by default.
-  bind: 0.0.0.0
-
-  # The TCP port to listen on.
-  port: 8888
-
-  # SSL options. Relative paths names have to be specified relative to the
-  # above directory.
-  ssl:
-    enable: false
-    cert: /path/to/gitdub.crt
-    key: /path/to/gitdub.key
-
-  # Only process POST requests from the these IP addresses (optioanl). If empty
-  # or not set, gitdub processes requests from all addresses.
-  #
-  # Github only.
-  #allowed_sources: [207.97.227.253, 50.57.128.197, 108.171.174.178]
-  #
-  allowed_sources: []
-
-  # Flag that determines whether the first arriving data results in sending
-  # emails. If false, gitdub sends out an email for every single commit since
-  # the repository creation. If true, the first arriving data only marks all
-  # existing commits as emailed without actually sending a notice.
-  silent_init: false
-
-
-  # The interval in seconds of how often to check the file for modifications.
-  # If the modification time of the configuration file is new than the time it
-  # was read last, gitdub re-reads all configuration values except for bind,
-  # port, and ssl.
-  monitor: 0
-
-notifier:
-  # The email sender. (Can be overriden for each repository.)
-  from: gitdub
-
-  # The list of email receivers. (Can be overriden for each repository.)
-  to: [user1@host.com, user2@host.com]
-
-  # The email subject prefix. (Can be overriden for each repository.)
-  subject: '[git]'
-
-# The github configuration. Each entry represents either a single repository or
-# all repositories for a given user/organization name.
-github:
-  - id: open-mpi/hwloc
-    protocol: ssh # Allowed protocols: git (default), ssh, https
-    to: [hwloc-commits@lists.open-mpi.org]
-    subject: 'Git: '
-
-  - id: open-mpi/hwloc-debian
-    protocol: ssh # Allowed protocols: git (default), ssh, https
-    to: [hwloc-commits@lists.open-mpi.org]
-    subject: 'Git: '
-
-  - id: open-mpi/mtt
-    protocol: ssh # Allowed protocols: git (default), ssh, https
-    to: [mtt-commits@lists.open-mpi.org]
-    subject: 'Git: '
-
-  - id: open-mpi/ompi-www
-    protocol: ssh # Allowed protocols: git (default), ssh, https
-    to: [ompi-commits@lists.open-mpi.org]
-    subject: 'Git: '
-
-  - id: open-mpi/docs
-    protocol: ssh # Allowed protocols: git (default), ssh, https
-    to: [ompi-commits@lists.open-mpi.org]
-    subject: 'Git: '
-
-  - id: open-mpi/ompi-tests
-    protocol: ssh # Allowed protocols: git (default), ssh, https
-    to: [ompi-commits@lists.open-mpi.org]
-    subject: 'Git: '
-
-  - id: open-mpi/ompi
-    protocol: ssh # Allowed protocols: git (default), ssh, https
-    to: [ompi-commits@lists.open-mpi.org]
-    subject: 'Git: '
-
-  - id: open-mpi/ompi-release
-    protocol: ssh # Allowed protocols: git (default), ssh, https
-    to: [ompi-commits@lists.open-mpi.org]
-    subject: 'Git: '
-
-  - id: pmix/master
-    protocol: ssh # Allowed protocols: git (default), ssh, https
-    to: [pmix-commits@lists.open-mpi.org]
-    subject: 'Git: '
-
-  # A wildcard entry that specifies settings for all repositories of a user or
-  # organization.
-  #- id: mavam/.*
-  #  subject: '[foo]'
-  #  to: [vallentin@icir.org]
diff --git a/contrib/infrastructure/github-send-commit-mails.pl b/contrib/infrastructure/github-send-commit-mails.pl
deleted file mode 100755
index 58f8cf7149..0000000000
--- a/contrib/infrastructure/github-send-commit-mails.pl
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-
-use Cwd;
-
-die "Must specify location of source git repo"
-    if ($#ARGV < 0);
-
-sub doit {
-    my ($cmd, $repo) = @_;
-
-    my $rc;
-    my $outfile = "/tmp/github-send-email-tmp.$$";
-    unlink($outfile);
-    $rc = system("$cmd >$outfile 2>&1");
-    if (0 != $rc) {
-        print "Command failed:
-
-Command: $cmd
-Repo:    $repo
-Output:\n";
-        open(IN, $outfile);
-        print $_
-            while (<IN>);
-        close(IN);
-        die "Aborting";
-    }
-    unlink($outfile);
-}
-
-foreach my $src_repo (@ARGV) {
-    die "Specified location of source git repo is invalid"
-        if (! -d $src_repo);
-    chdir($src_repo);
-    die "Could not chdir to $src_repo"
-        if (getcwd() != $src_repo);
-
-    doit("/u/mpiteam/git/local/bin/git fetch", $src_repo);
-    doit("/u/mpiteam/git/local/bin/git push email", $src_repo);
-}
-
diff --git a/contrib/infrastructure/openmpi-update-www.open-mpi.org.sh b/contrib/infrastructure/openmpi-update-www.open-mpi.org.sh
deleted file mode 100755
index 9c237f6531..0000000000
--- a/contrib/infrastructure/openmpi-update-www.open-mpi.org.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-cd /l/osl/www/www.open-mpi.org
-
-# Absolutely ensure that we have a umask of 2 so that others can
-# run "svn up" in this tree, too
-umask 2
-
-git pull --rebase origin
-
-date >> /tmp/bogus-mpiteam