diff --git a/OPAL/opt-pilot/0/variants b/OPAL/opt-pilot/0/variants
deleted file mode 100644
index eb5c4ef..0000000
--- a/OPAL/opt-pilot/0/variants
+++ /dev/null
@@ -1,2 +0,0 @@
-opt-pilot/0.1.3-20170217	unstable gcc/5.4.0 openmpi/1.10.4 dks/1.0.1 hdf5/1.8.18 H5hut/2.0.0rc3 trilinos/12.10.1 parmetis/4.0.3 boost/1.62.0 gsl/2.2.1 root/6.08.02 cuda/8.0.44 OPAL/1.5.1-20170217 b:cmake/3.6.3
-opt-pilot/0.1.4rc1		unstable gcc/5.4.0 openmpi/1.10.4 dks/1.1.1 hdf5/1.8.18 H5hut/2.0.0rc3 trilinos/12.10.1 parmetis/4.0.3 boost/1.62.0 gsl/2.2.1 root/6.08.02 cuda/8.0.44 OPAL/1.6.0rc1 b:cmake/3.6.3
diff --git a/OPAL/opt-pilot/0/variants.Darwin b/OPAL/opt-pilot/0/variants.Darwin
deleted file mode 100644
index 47cf932..0000000
--- a/OPAL/opt-pilot/0/variants.Darwin
+++ /dev/null
@@ -1 +0,0 @@
-opt-pilot/0.1.3-20170126	unstable gcc/5.4.0 openmpi/1.10.4 hdf5/1.8.18 H5hut/2.0.0rc3 trilinos/12.10.1 boost/1.62.0 gsl/2.2.1 root/6.08.02 OPAL/1.5.0-20170126 b:cmake/3.6.3
diff --git a/OPAL/opt-pilot/README.md b/OPAL/opt-pilot/README.md
deleted file mode 100644
index 5ff339d..0000000
--- a/OPAL/opt-pilot/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This build-block is obsolete! opt-pilot has been integrated into OPAL.
diff --git a/OPAL/opt-pilot/build b/OPAL/opt-pilot/build
deleted file mode 100755
index 6561d7d..0000000
--- a/OPAL/opt-pilot/build
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env modbuild
-
-pbuild::configure() {
-	local configure_args=()
-	case "${OS}" in
-		Linux )
-			configure_args+=( "-DENABLE_DKS=ON" )
-			;;
-	esac
-	cmake \
-		-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-		-DCMAKE_BUILD_TYPE=RELEASE \
-		"${configure_args[@]}" \
-		"${SRC_DIR}" || std::die 1 "cmake failed"
-}
-
-pbuild::add_to_group 'OPAL'
-pbuild::set_supported_compilers 'gcc/4.8' 'gcc/5.4'
-pbuild::make_all
-
diff --git a/OPAL/opt-pilot/modulefile b/OPAL/opt-pilot/modulefile
deleted file mode 100644
index f51e269..0000000
--- a/OPAL/opt-pilot/modulefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#%Module1.0
-
-module-whatis		"opt-pilot"
-module-url		"http://amas.psi.ch/OPAL"
-module-license		"PSI"
-module-maintainer	"Achim Gsell <achim.gsell@psi.ch>"
-
-module-help		"
-"
-
-
diff --git a/config/Pmodules.conf b/config/Pmodules.conf
deleted file mode 100644
index 22d1961..0000000
--- a/config/Pmodules.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-declare -a COMPILER_VERSIONS=( 'gcc/4.7.4' 'gcc/4.8.3' 'gcc/4.8.4' 'gcc/4.9.2' )
-declare -a MPI_VERSIONS=( 'openmpi/1.6.5' 'openmpi/1.8.2' 'openmpi/1.8.4' )
-declare -a HDF5_VERSIONS=( 'hdf5/1.8.12' 'hdf5/1.8.14' )
-declare -a HDF5_SERIAL_VERSIONS=( 'hdf5_serial/1.8.12' 'hdf5_serial/1.8.14' )