diff --git a/packages/performance/vampirtrace/vampirtrace-5.10.1 b/packages/performance/vampirtrace/vampirtrace-5.10.1
deleted file mode 100755
index 175c532..0000000
--- a/packages/performance/vampirtrace/vampirtrace-5.10.1
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
-#
- 
-CATEGORY="performance"
-PACKAGE="vampirtrace"
-VERSION="5.10.1"
-URL="http://www.tu-dresden.de/zih/vampirtrace/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-
-# Archive A and package name P
-A="VampirTrace-${VERSION}.tar.gz"
-P="VampirTrace-${VERSION}"
-
-enable_papi=${enable_papi:=1}
-enable_papi=${enable_cuda:=1}
-
-
-# Other interesting configure options:
-#--enable-sampling \
-CONFIGURE_OPTS="\
-		--with-mpi-dir=$MPI_DIR \
-		"
-
-# use PAPI
-if [ $enable_papi != 0 ] ; then
-    module load system/perfctr system/papi
-    PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
-fi
-
-# use CUDA
-if [ $enable_cuda != 0 ] ; then
-    module load cuda
-    CUDA_DIR=${CUDA_DIR:=$(dirname $(dirname $(which nvcc)))}
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
-        --with-cuda-dir=$CUDA_DIR \
-        --with-cuda-inc-dir=$CUDA_DIR/include \
-        --with-cuda-lib-dir=$CUDA_DIR/lib \
-        --with-cudart-dir=$CUDA_DIR \
-        --with-cudart-lib-dir=$CUDA_DIR/lib64 \
-        "
-fi
diff --git a/packages/performance/vampirtrace/vampirtrace-5.11 b/packages/performance/vampirtrace/vampirtrace-5.11
deleted file mode 100755
index c4a5fd3..0000000
--- a/packages/performance/vampirtrace/vampirtrace-5.11
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
-#
- 
-CATEGORY="performance"
-PACKAGE="vampirtrace"
-VERSION="5.11"
-URL="http://www.tu-dresden.de/zih/vampirtrace/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-
-# Archive A and package name P
-A="VampirTrace-${VERSION}.tar.gz"
-P="VampirTrace-${VERSION}"
-
-enable_papi=${enable_papi:=1}
-enable_papi=${enable_cuda:=1}
-
-
-# Other interesting configure options:
-#--enable-sampling \
-CONFIGURE_OPTS="\
-		--with-mpi-dir=$MPI_DIR \
-		"
-
-# use PAPI
-if [ $enable_papi != 0 ] ; then
-    module load system/perfctr system/papi
-    PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
-fi
-
-# use CUDA
-if [ $enable_cuda != 0 ] ; then
-    module load cuda
-    CUDA_DIR=${CUDA_DIR:=$(dirname $(dirname $(which nvcc)))}
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
-        --with-cuda-dir=$CUDA_DIR \
-        --with-cuda-inc-dir=$CUDA_DIR/include \
-        --with-cuda-lib-dir=$CUDA_DIR/lib \
-        --with-cudart-dir=$CUDA_DIR \
-        --with-cudart-lib-dir=$CUDA_DIR/lib64 \
-        "
-fi
diff --git a/packages/performance/vampirtrace/vampirtrace-5.12.1 b/packages/performance/vampirtrace/vampirtrace-5.12.1
deleted file mode 100755
index b052aae..0000000
--- a/packages/performance/vampirtrace/vampirtrace-5.12.1
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
-#
- 
-CATEGORY="performance"
-PACKAGE="vampirtrace"
-VERSION="5.12.1"
-URL="http://www.tu-dresden.de/zih/vampirtrace/"
-INSTALLER="Rainer Keller <keller@hlrs.de>"
-
-
-# Archive A and package name P
-A="VampirTrace-${VERSION}.tar.gz"
-P="VampirTrace-${VERSION}"
-
-enable_papi=${enable_papi:=1}
-enable_papi=${enable_cuda:=0}
-
-
-# Other interesting configure options:
-#--enable-sampling \
-CONFIGURE_OPTS="$CONFIGURE_OPTS \
-		--with-mpi-dir=$MPI_DIR \
-		"
-
-# use PAPI
-if [ $enable_papi != 0 ] ; then
-    module load papi
-    PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
-fi
-
-# use CUDA
-if [ $enable_cuda != 0 ] ; then
-    module load cuda
-    CUDA_DIR=${CUDA_DIR:=$(dirname $(dirname $(which nvcc)))}
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
-        --with-cuda-dir=$CUDA_DIR \
-        --with-cuda-inc-dir=$CUDA_DIR/include \
-        --with-cuda-lib-dir=$CUDA_DIR/lib \
-        --with-cudart-dir=$CUDA_DIR \
-        --with-cudart-lib-dir=$CUDA_DIR/lib64 \
-        "
-fi
diff --git a/packages/performance/vampirtrace/vampirtrace-5.12.2 b/packages/performance/vampirtrace/vampirtrace-5.12.2
deleted file mode 100755
index 80ed2ec..0000000
--- a/packages/performance/vampirtrace/vampirtrace-5.12.2
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2011
-#
- 
-CATEGORY="performance"
-PACKAGE="vampirtrace"
-VERSION="5.12.2"
-URL="http://www.tu-dresden.de/zih/vampirtrace/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-
-# Archive A and package name P
-A="VampirTrace-${VERSION}.tar.gz"
-P="VampirTrace-${VERSION}"
-
-enable_papi=${enable_papi:=1}
-enable_cuda=${enable_cuda:=0}
-
-
-# Other interesting configure options:
-#--enable-sampling \
-
-if [[ $PLATFORM == "hermit1" ]] ; then
-    CONFIGURE_OPTS=" \
-        --with-platform=crayxt \
-        "
-else
-    CONFIGURE_OPTS=" \
-        --with-mpi-dir=$MPI_DIR \
-        "
-fi
-
-# use PAPI
-if [ $enable_papi != 0 ] ; then
-    if [[ $PLATFORM == "hermit1" ]] ; then
-        module load papi
-    else
-        module load performance/papi
-        #PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
-        #CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
-    fi	
-fi
-
-# use CUDA
-if [ $enable_cuda != 0 ] ; then
-    module load cuda
-    CUDA_DIR=${CUDA_DIR:=$(dirname $(dirname $(which nvcc)))}
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
-        --with-cuda-dir=$CUDA_DIR \
-        --with-cuda-inc-dir=$CUDA_DIR/include \
-        --with-cuda-lib-dir=$CUDA_DIR/lib \
-        --with-cudart-dir=$CUDA_DIR \
-        --with-cudart-lib-dir=$CUDA_DIR/lib64 \
-        "
-fi
-
-src_prepare() {
-    if [[ $PLATFORM == "hermit1" ]] ; then
-        patch config/defaults/crayxt < $SCLASS_DIR/$SCLASSFILE-hermit-0000.patch
-    fi
-}
diff --git a/packages/performance/vampirtrace/vampirtrace-5.12.2-hermit-0000.patch b/packages/performance/vampirtrace/vampirtrace-5.12.2-hermit-0000.patch
deleted file mode 100644
index 1d90fa7..0000000
--- a/packages/performance/vampirtrace/vampirtrace-5.12.2-hermit-0000.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-17c17
-< with_shlibc=/lib64/libc-2.4.so
----
-> with_shlibc=/lib64/libc-2.11.1.so
diff --git a/packages/performance/vampirtrace/vampirtrace-5.13 b/packages/performance/vampirtrace/vampirtrace-5.13
deleted file mode 100755
index 8f8fe07..0000000
--- a/packages/performance/vampirtrace/vampirtrace-5.13
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2012
-#
- 
-CATEGORY="performance"
-PACKAGE="vampirtrace"
-VERSION="5.13"
-URL="http://www.tu-dresden.de/zih/vampirtrace/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-
-# Archive A and package name P
-A="VampirTrace-${VERSION}.tar.gz"
-P="VampirTrace-${VERSION}"
-
-enable_papi=${enable_papi:=1}
-enable_cuda=${enable_cuda:=0}
-
-
-# Other interesting configure options:
-#--enable-sampling \
-
-if [[ $PLATFORM == "hermit1" ]] ; then
-    CONFIGURE_OPTS=" \
-        --with-platform=crayxt \
-        "
-else
-    CONFIGURE_OPTS=" \
-        --with-mpi-dir=$MPI_DIR \
-        "
-fi
-
-# use PAPI
-if [ $enable_papi != 0 ] ; then
-    if [[ $PLATFORM == "hermit1" ]] ; then
-        module load papi
-    else
-        module load performance/papi
-        #PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
-        #CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
-    fi	
-fi
-
-# use CUDA
-if [ $enable_cuda != 0 ] ; then
-    module load cuda
-    CUDA_DIR=${CUDA_DIR:=$(dirname $(dirname $(which nvcc)))}
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
-        --with-cuda-dir=$CUDA_DIR \
-        --with-cuda-inc-dir=$CUDA_DIR/include \
-        --with-cuda-lib-dir=$CUDA_DIR/lib \
-        --with-cudart-dir=$CUDA_DIR \
-        --with-cudart-lib-dir=$CUDA_DIR/lib64 \
-        "
-fi
-
-src_prepare() {
-    if [[ $PLATFORM == "hermit1" ]] ; then
-        patch config/defaults/crayxt < $SCLASS_DIR/$SCLASSFILE-hermit-0000.patch
-    fi
-}
diff --git a/packages/performance/vampirtrace/vampirtrace-5.14 b/packages/performance/vampirtrace/vampirtrace-5.14
deleted file mode 100755
index 1001b99..0000000
--- a/packages/performance/vampirtrace/vampirtrace-5.14
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2012
-#
- 
-CATEGORY="performance"
-PACKAGE="vampirtrace"
-VERSION="5.14"
-URL="http://www.tu-dresden.de/zih/vampirtrace/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-
-# Archive A and package name P
-A="VampirTrace-${VERSION}.tar.gz"
-P="VampirTrace-${VERSION}"
-
-enable_papi=${enable_papi:=1}
-enable_cuda=${enable_cuda:=0}
-
-
-# Other interesting configure options:
-#--enable-sampling \
-
-if [[ $PLATFORM == "hermit1" ]] ; then
-    CONFIGURE_OPTS=" \
-        --with-platform=crayxt \
-        "
-else
-    CONFIGURE_OPTS=" \
-        --with-mpi-dir=$MPI_DIR \
-        "
-fi
-
-# use PAPI
-if [ $enable_papi != 0 ] ; then
-    if [[ $PLATFORM == "hermit1" ]] ; then
-        module load papi
-    else
-        module load performance/papi
-        #PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
-        #CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
-    fi	
-fi
-
-# use CUDA
-if [ $enable_cuda != 0 ] ; then
-    module load cuda
-    CUDA_DIR=${CUDA_DIR:=$(dirname $(dirname $(which nvcc)))}
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
-        --with-cuda-dir=$CUDA_DIR \
-        --with-cuda-inc-dir=$CUDA_DIR/include \
-        --with-cuda-lib-dir=$CUDA_DIR/lib \
-        --with-cudart-dir=$CUDA_DIR \
-        --with-cudart-lib-dir=$CUDA_DIR/lib64 \
-        "
-fi
-
-src_prepare() {
-    if [[ $PLATFORM == "hermit1" ]] ; then
-        patch config/defaults/crayxt < $SCLASS_DIR/$SCLASSFILE-hermit-0000.patch
-    fi
-}
diff --git a/packages/performance/vampirtrace/vampirtrace-5.14.1 b/packages/performance/vampirtrace/vampirtrace-5.14.1
deleted file mode 100755
index 2184f70..0000000
--- a/packages/performance/vampirtrace/vampirtrace-5.14.1
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2012
-#
- 
-CATEGORY="performance"
-PACKAGE="vampirtrace"
-VERSION="5.14.1"
-URL="http://www.tu-dresden.de/zih/vampirtrace/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-
-# Archive A and package name P
-A="VampirTrace-${VERSION}.tar.gz"
-P="VampirTrace-${VERSION}"
-
-enable_papi=${enable_papi:=1}
-enable_cuda=${enable_cuda:=0}
-
-
-# Other interesting configure options:
-#--enable-sampling \
-
-if [[ $PLATFORM == "hermit1" ]] ; then
-    CONFIGURE_OPTS=" \
-        --build=x86_64-unknown-linux-gnu \
-        --host=x86_64-cray-linux-gnu \
-        --without-cross-prefix \
-        --with-platform=crayxe \
-        --disable-exectrace \
-        "
-else
-    CONFIGURE_OPTS=" \
-        --with-mpi-dir=$MPI_DIR \
-        "
-fi
-
-# use PAPI
-if [ $enable_papi != 0 ] ; then
-    if [[ $PLATFORM == "hermit1" ]] ; then
-        module load papi
-    else
-        module load performance/papi
-        PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
-        CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
-    fi	
-fi
-
-# use CUDA
-if [ $enable_cuda != 0 ] ; then
-    module load cuda
-    CUDA_DIR=${CUDA_DIR:=$(dirname $(dirname $(which nvcc)))}
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
-        --with-cuda-dir=$CUDA_DIR \
-        --with-cuda-inc-dir=$CUDA_DIR/include \
-        --with-cuda-lib-dir=$CUDA_DIR/lib \
-        --with-cudart-dir=$CUDA_DIR \
-        --with-cudart-lib-dir=$CUDA_DIR/lib64 \
-        "
-fi
-
-#src_prepare() {
-#    if [[ $PLATFORM == "hermit1" ]] ; then
-#        patch config/defaults/crayxt < $SCLASS_DIR/$SCLASSFILE-hermit-0000.patch
-#    fi
-#}
diff --git a/packages/performance/vampirtrace/vampirtrace-5.14.2 b/packages/performance/vampirtrace/vampirtrace-5.14.2
deleted file mode 100755
index 6e58003..0000000
--- a/packages/performance/vampirtrace/vampirtrace-5.14.2
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# sit class file
-#
-# Christoph Niethammer <niethammer@hlrs.de> (C) 2012
-#
- 
-CATEGORY="performance"
-PACKAGE="vampirtrace"
-VERSION="5.14.2"
-URL="http://www.tu-dresden.de/zih/vampirtrace/"
-INSTALLER="Christoph Niethammer <niethammer@hlrs.de>"
-
-
-# Archive A and package name P
-A="VampirTrace-${VERSION}.tar.gz"
-P="VampirTrace-${VERSION}"
-
-enable_papi=${enable_papi:=1}
-enable_cuda=${enable_cuda:=0}
-
-
-# Other interesting configure options:
-#--enable-sampling \
-
-if [[ $PLATFORM == "hermit1" ]] ; then
-    CONFIGURE_OPTS=" \
-        --build=x86_64-unknown-linux-gnu \
-        --host=x86_64-cray-linux-gnu \
-        --without-cross-prefix \
-        --with-platform=crayxe \
-        --disable-exectrace \
-        "
-else
-    CONFIGURE_OPTS=" \
-        --with-mpi-dir=$MPI_DIR \
-        "
-fi
-
-# use PAPI
-if [ $enable_papi != 0 ] ; then
-    if [[ $PLATFORM == "hermit1" ]] ; then
-        module load papi
-    else
-        module load performance/papi
-        PAPI_DIR=$(dirname $(dirname $(which papi_avail)))
-        CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-papi-dir=$PAPI_DIR"
-    fi	
-fi
-
-# use CUDA
-if [ $enable_cuda != 0 ] ; then
-    module load cuda
-    CUDA_DIR=${CUDA_DIR:=$(dirname $(dirname $(which nvcc)))}
-    CONFIGURE_OPTS="${CONFIGURE_OPTS} \
-        --with-cuda-dir=$CUDA_DIR \
-        --with-cuda-inc-dir=$CUDA_DIR/include \
-        --with-cuda-lib-dir=$CUDA_DIR/lib \
-        --with-cudart-dir=$CUDA_DIR \
-        --with-cudart-lib-dir=$CUDA_DIR/lib64 \
-        "
-fi
-
-#src_prepare() {
-#    if [[ $PLATFORM == "hermit1" ]] ; then
-#        patch config/defaults/crayxt < $SCLASS_DIR/$SCLASSFILE-hermit-0000.patch
-#    fi
-#}