diff --git a/packages/mpi/mvapich2/mvapich2-1.6 b/packages/mpi/mvapich2/mvapich2-1.6
deleted file mode 100755
index ec01d4b..0000000
--- a/packages/mpi/mvapich2/mvapich2-1.6
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
-#
- 
-CATEGORY="mpi"
-PACKAGE="mvapich2"
-VERSION="1.6"
-URL="http://mvapich.cse.ohio-state.edu/overview/mvapich2/"
-INSTALLER="Rainer Keller <keller@hlrs.de>"
-
-# Archive A and package name P
-A=${PACKAGE}-${VERSION}.tgz
-P=${PACKAGE}-${VERSION}
- 
-# Circumvent problems with parallel build
-MAKEOPTS="-j1"
-
-
-# Other interesting configure options:
-#--with-file-system=lustre
-CONFIGURE_OPTS="\
-        --enable-shared \
-        --enable-sharedlibs=gcc"
diff --git a/packages/mpi/mvapich2/mvapich2-1.7 b/packages/mpi/mvapich2/mvapich2-1.7
deleted file mode 100755
index 8be2253..0000000
--- a/packages/mpi/mvapich2/mvapich2-1.7
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2012
-#
- 
-CATEGORY="mpi"
-PACKAGE="mvapich2"
-VERSION="1.7"
-URL="http://mvapich.cse.ohio-state.edu/overview/mvapich2/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-# Archive A and package name P
-A=${PACKAGE}-${VERSION}.tgz
-P=${PACKAGE}-${VERSION}
- 
-# Circumvent problems with parallel build
-MAKEOPTS="-j1"
-
-
-# Other interesting configure options:
-#--with-file-system=lustre
-CONFIGURE_OPTS="\
-        --enable-shared \
-        --enable-sharedlibs=gcc \
-		"
diff --git a/packages/mpi/mvapich2/mvapich2-1.8-r5435 b/packages/mpi/mvapich2/mvapich2-1.8-r5435
deleted file mode 100755
index 773df2a..0000000
--- a/packages/mpi/mvapich2/mvapich2-1.8-r5435
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2012
-#
- 
-CATEGORY="mpi"
-PACKAGE="mvapich2"
-VERSION="1.8-r5435"
-URL="http://mvapich.cse.ohio-state.edu/overview/mvapich2/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-# Archive A and package name P
-A=${PACKAGE}-${VERSION}.tar.gz
-P=${PACKAGE}-${VERSION}
- 
-# Circumvent problems with parallel build
-MAKEOPTS="-j1"
-
-
-# Other interesting configure options:
-#--with-file-system=lustre
-CONFIGURE_OPTS="\
-        --enable-shared \
-        --enable-sharedlibs=gcc \
-		"
diff --git a/packages/mpi/mvapich2/mvapich2-1.9 b/packages/mpi/mvapich2/mvapich2-1.9
deleted file mode 100755
index fca205e..0000000
--- a/packages/mpi/mvapich2/mvapich2-1.9
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2013
-#
- 
-CATEGORY="mpi"
-PACKAGE="mvapich2"
-VERSION="1.9"
-URL="http://mvapich.cse.ohio-state.edu/overview/mvapich2/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-# Archive A and package name P
-A=${PACKAGE}-${VERSION}.tgz
-P=${PACKAGE}-${VERSION}
- 
-# Circumvent problems with parallel build
-#MAKEOPTS="-j1"
-
-
-# Other interesting configure options:
-CONFIGURE_OPTS="\
-        --enable-shared \
-        --enable-sharedlibs=gcc \
-	--with-file-system=lustre \
-		"
diff --git a/packages/mpi/mvapich2/mvapich2-2.0b b/packages/mpi/mvapich2/mvapich2-2.0b
deleted file mode 100755
index 22ce1e0..0000000
--- a/packages/mpi/mvapich2/mvapich2-2.0b
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2014
-#
- 
-CATEGORY="mpi"
-PACKAGE="mvapich2"
-VERSION="2.0b"
-URL="http://mvapich.cse.ohio-state.edu/overview/mvapich2/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-# Archive A and package name P
-A=${PACKAGE}-${VERSION}.tgz
-P=${PACKAGE}-${VERSION}
- 
-# Circumvent problems with parallel build
-#MAKEOPTS="-j1"
-
-
-# Other interesting configure options:
-CONFIGURE_OPTS="\
-        --enable-shared \
-        --enable-sharedlibs=gcc \
-	--with-file-system=lustre \
-		"
diff --git a/packages/mpi/mvapich2/mvapich2-2.0rc2 b/packages/mpi/mvapich2/mvapich2-2.0rc2
deleted file mode 100755
index f5693db..0000000
--- a/packages/mpi/mvapich2/mvapich2-2.0rc2
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2014
-#
-
-CATEGORY="mpi"
-PACKAGE="mvapich2"
-VERSION="2.0rc2"
-URL="http://mvapich.cse.ohio-state.edu/overview/mvapich2/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-# Archive A and package name P
-A=${PACKAGE}-${VERSION}.tgz
-P=${PACKAGE}-${VERSION}
-
-# Circumvent problems with parallel build
-#MAKEOPTS="-j1"
-
-
-# Other interesting configure options:
-CONFIGURE_OPTS="\
-        --enable-shared \
-        --enable-sharedlibs=gcc \
-        --with-file-system=lustre \
-		"