diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..e045998
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,10 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+ci:
+  autofix_prs: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f11a2be..1ea9dd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ Until May 2022 (inclusive) no changelog was kept. We might try to reconstruct it
 
 * Alpaca: Unused, unmaintained and doesn't include all relevant production
   mechanisms for our use
+* Remove unused recipes
 
 ## [24.10](https://github.com/ShipSoft/shipdist/tree/24.10)
 
diff --git a/README.md b/README.md
index a317dff..b3e1e78 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # shipdist
 
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/ShipSoft/shipdist/main.svg)](https://results.pre-commit.ci/latest/github/ShipSoft/shipdist/main)
+
 Recipes to build `FairShip` and it's dependencies using `aliBuild`
 
 ## General information
diff --git a/alidpg.sh b/alidpg.sh
deleted file mode 100644
index c890e5b..0000000
--- a/alidpg.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-package: AliDPG
-version: "%(tag_basename)s"
-tag: master
-source: https://github.com/alisw/AliDPG
----
-#!/bin/bash -e
-rsync -a --exclude='**/.git' --delete --delete-excluded \
-      $SOURCEDIR/ $INSTALLROOT/
-
-# Modulefile
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv ALIDPG_RELEASE \$version
-setenv ALIDPG_VERSION $PKGVERSION
-setenv ALIDPG_ROOT \$::env(BASEDIR)/$PKGNAME/\$::env(ALIDPG_RELEASE)
-EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
diff --git a/alien-cas.sh b/alien-cas.sh
deleted file mode 100644
index 2d1809a..0000000
--- a/alien-cas.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-package: AliEn-CAs
-version: v1
-tag: master
-source: https://github.com/alisw/alien-cas.git 
----
-#!/bin/bash -e
-DEST="$INSTALLROOT/globus/share/certificates"
-mkdir -p "$DEST"
-for D in $SOURCEDIR/*; do
-  [[ ! -d "$D" ]] && continue
-  rsync -a "$D/" "$DEST/"
-done
diff --git a/alien-runtime.sh b/alien-runtime.sh
deleted file mode 100644
index ac91880..0000000
--- a/alien-runtime.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-package: AliEn-Runtime
-version: "v2-19-le%(defaults_upper)s"
-build_requires:
- - zlib
- - libxml2
- - "OpenSSL:(?!osx)"
- - "osx-system-openssl:(osx.*)"
- - AliEn-CAs
- - gSOAP
- - MonALISA-gSOAP-client
- - ApMon-CPP
- - XRootD
- - xalienfs
- - UUID
-requires:
- - "GCC-Toolchain:(?!osx)"
- - "Xcode:(osx.*)"
-prepend_path:
-  PERLLIB: "$ALIEN_RUNTIME_ROOT/lib/perl"
-env:
-  GSHELL_ROOT: "$ALIEN_RUNTIME_ROOT"
-  GSHELL_NO_GCC: "1"
-  X509_CERT_DIR: "$ALIEN_RUNTIME_ROOT/globus/share/certificates"
----
-#!/bin/bash -e
-for RPKG in $BUILD_REQUIRES; do
-  RPKG_UP=$(echo $RPKG|tr '[:lower:]' '[:upper:]'|tr '-' '_')
-  RPKG_ROOT=$(eval echo "\$${RPKG_UP}_ROOT")
-  rsync -a $RPKG_ROOT/ $INSTALLROOT/
-  pushd $INSTALLROOT/../../..
-    env WORK_DIR=$PWD sh -e $INSTALLROOT/relocate-me.sh
-  popd
-done
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
-# Our environment
-setenv ALIEN_RUNTIME_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path LD_LIBRARY_PATH \$::env(ALIEN_RUNTIME_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(ALIEN_RUNTIME_ROOT)/lib")
-prepend-path PATH \$::env(ALIEN_RUNTIME_ROOT)/bin
-prepend-path PERLLIB \$::env(ALIEN_RUNTIME_ROOT)/lib/perl
-setenv GSHELL_ROOT \$::env(ALIEN_RUNTIME_ROOT)
-setenv X509_CERT_DIR \$::env(ALIEN_RUNTIME_ROOT)/globus/share/certificates
-setenv GSHELL_NO_GCC 1
-EoF
diff --git a/alien-workqueue.sh b/alien-workqueue.sh
deleted file mode 100644
index d87afd3..0000000
--- a/alien-workqueue.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-package: AliEn-WorkQueue
-version: v1.3
-source: https://github.com/alisw/alien-workqueue
-requires:
- - "GCC-Toolchain:(?!osx)"
- - cctools
-build_requires:
- - CMake
----
-#!/bin/bash -e
-cmake $SOURCEDIR                          \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
-      -DCCTOOLS=$CCTOOLS_ROOT
-make ${JOBS+-j$JOBS} install
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} cctools/$CCTOOLS_VERSION-$CCTOOLS_REVISION
-# Our environment
-setenv ALIEN_WORKQUEUE_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(ALIEN_WORKQUEUE_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(ALIEN_WORKQUEUE_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(ALIEN_WORKQUEUE_ROOT)/lib")
-EoF
diff --git a/aligenerators.sh b/aligenerators.sh
deleted file mode 100644
index 1ec0214..0000000
--- a/aligenerators.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-package: AliGenerators
-version: "v%(year)s%(month)s%(day)s%(defaults_upper)s"
-requires:
-  - AMPT
-  - CRMC
-  - DPMJET
-  - EPOS
-  - Herwig
-  - JEWEL
-  - POWHEG
-  - pythia
-  - pythia6
-  - SHERPA
-  - ThePEG
-  - AGILe
-  - Sacrifice
-  - aligenmc
-build_requires:
-  - EPOS-test
----
-#!/bin/bash -ex
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 \
-  AGILe/$AGILE_VERSION-$AGILE_REVISION \
-  aligenmc/$ALIGENMC_VERSION-$ALIGENMC_REVISION \
-  AMPT/$AMPT_VERSION-$AMPT_REVISION \
-  CRMC/$CRMC_VERSION-$CRMC_REVISION \
-  DPMJET/$DPMJET_VERSION-$DPMJET_REVISION \
-  JEWEL/$JEWEL_VERSION-$JEWEL_REVISION \
-  Herwig/$HERWIG_VERSION-$HERWIG_REVISION \
-  POWHEG/$POWHEG_VERSION-$POWHEG_REVISION \
-  pythia/$PYTHIA_VERSION-$PYTHIA_REVISION \
-  pythia6/$PYTHIA6_VERSION-$PYTHIA6_REVISION \
-  Sacrifice/$SACRIFICE_VERSION-$SACRIFICE_REVISION \
-  SHERPA/$SHERPA_VERSION-$SHERPA_REVISION \
-  ThePEG/$THEPEG_VERSION-$THEPEG_REVISION
-EoF
diff --git a/aligenmc.sh b/aligenmc.sh
deleted file mode 100644
index 99207b1..0000000
--- a/aligenmc.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-package: aligenmc
-version: "%(tag_basename)s%(defaults_upper)s"
-tag: "v0.0.3"
-source: https://github.com/alisw/aligenmc
----
-#!/bin/bash -e
-
-rsync -a --exclude='**/.git' --delete --delete-excluded $SOURCEDIR/ $INSTALLROOT/
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv ALIGENMC_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(ALIGENMC_ROOT)
-EoF
diff --git a/aliphysics.sh b/aliphysics.sh
deleted file mode 100644
index 32861c5..0000000
--- a/aliphysics.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-package: AliPhysics
-version: "%(commit_hash)s%(defaults_upper)s"
-requires:
-  - AliRoot
-build_requires:
-  - "Xcode:(osx.*)"
-source: https://github.com/alisw/AliPhysics
-tag: master
-env:
-  ALICE_PHYSICS: "$ALIPHYSICS_ROOT"
-prepend_path:
-  ROOT_INCLUDE_PATH: "$ALIPHYSICS_ROOT/include"
-incremental_recipe: |
-  make ${JOBS:+-j$JOBS} install
-  ctest -R load_library --output-on-failure ${JOBS:+-j $JOBS}
-  [[ $CMAKE_BUILD_TYPE == COVERAGE ]] && mkdir -p "$WORK_DIR/$ARCHITECTURE/profile-data/AliRoot/$ALIROOT_VERSION-$ALIROOT_REVISION/" && rsync -acv --filter='+ */' --filter='+ *.cpp' --filter='+ *.cc' --filter='+ *.h' --filter='+ *.gcno' --filter='- *' "$BUILDDIR/" "$WORK_DIR/$ARCHITECTURE/profile-data/AliRoot/$ALIROOT_VERSION-$ALIROOT_REVISION/"
-  mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
----
-#!/bin/bash -e
-# Picking up ROOT from the system when our is disabled
-if [ "X$ROOT_ROOT" = X ]; then
-  ROOT_ROOT="$(root-config --prefix)"
-fi
-
-# Uses the same setup as AliRoot
-if [[ $CMAKE_BUILD_TYPE == COVERAGE ]]; then
-  source $ALIROOT_ROOT/etc/gcov-setup.sh
-fi
-
-cmake "$SOURCEDIR"                                                 \
-      -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"                        \
-      -DROOTSYS="$ROOT_ROOT"                                       \
-      ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"}  \
-      ${ALIEN_RUNTIME_ROOT:+-DALIEN="$ALIEN_RUNTIME_ROOT"}         \
-      ${FASTJET_ROOT:+-DFASTJET="$FASTJET_ROOT"}                   \
-      ${CGAL_ROOT:+-DCGAL="$CGAL_ROOT"}                            \
-      ${MPFR_ROOT:+-DMPFR="$MPFR_ROOT"}                            \
-      ${GMP_ROOT:+-DGMP="$GMP_ROOT"}                               \
-      -DALIROOT="$ALIROOT_ROOT"
-
-make ${IGNORE_ERRORS:+-k} ${JOBS+-j $JOBS} install
-# ctest will succeed if no load_library tests were found
-ctest -R load_library --output-on-failure ${JOBS:+-j $JOBS}
-
-[[ $CMAKE_BUILD_TYPE == COVERAGE ]]                                                       \
-  && mkdir -p "$WORK_DIR/${ARCHITECTURE}/profile-data/AliRoot/$ALIROOT_VERSION-$ALIROOT_REVISION/"  \
-  && rsync -acv --filter='+ */' --filter='+ *.c' --filter='+ *.cxx' --filter='+ *.cpp' --filter='+ *.cc' --filter='+ *.hpp' --filter='+ *.h' --filter='+ *.gcno' --filter='- *' "$BUILDDIR/" "$WORK_DIR/${ARCHITECTURE}/profile-data/AliRoot/$ALIROOT_VERSION-$ALIROOT_REVISION/"
-
-# Modulefile
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 AliRoot/$ALIROOT_VERSION-$ALIROOT_REVISION
-# Our environment
-setenv ALIPHYSICS_VERSION \$version
-setenv ALIPHYSICS_RELEASE \$::env(ALIPHYSICS_VERSION)
-setenv ALICE_PHYSICS \$::env(BASEDIR)/$PKGNAME/\$::env(ALIPHYSICS_RELEASE)
-prepend-path PATH \$::env(ALICE_PHYSICS)/bin
-prepend-path LD_LIBRARY_PATH \$::env(ALICE_PHYSICS)/lib
-prepend-path ROOT_INCLUDE_PATH \$::env(ALICE_PHYSICS)/include
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(ALICE_PHYSICS)/lib")
-EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
diff --git a/aliroot-coverage.sh b/aliroot-coverage.sh
deleted file mode 100644
index 613d17a..0000000
--- a/aliroot-coverage.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-package: AliRoot-coverage
-version: "%(year)s%(month)s%(day)s%(defaults_upper)s"
-force_rebuild: 1
-requires:
-  - lcov
-  - AliRoot-test
----
-#!/bin/sh
-# Uses the same setup as AliRoot
-if [[ $CMAKE_BUILD_TYPE == COVERAGE ]]; then
-  source $ALIROOT_ROOT/etc/gcov-setup.sh
-fi
-
-mkdir -p $WORK_DIR/$ARCHITECTURE/profile-web
-# Run coverage analysis directly from aliBuild
-if [[ $CMAKE_BUILD_TYPE == COVERAGE ]]; then
-  lcov --capture --directory $WORK_DIR/$ARCHITECTURE/profile-data --output-file $WORK_DIR/$ARCHITECTURE/profile-web/coverage.info
-  genhtml $WORK_DIR/$ARCHITECTURE/profile-web/coverage.info --output-directory $WORK_DIR/$ARCHITECTURE/profile-web/out
-  pushd $WORK_DIR/$ARCHITECTURE/profile-web/out ; zip -r ${WORKSPACE:-..}/coverage-`date +%Y%m%d`-$BUILD_NUMBER.zip . ; popd
-fi
diff --git a/aliroot-csa.sh b/aliroot-csa.sh
deleted file mode 100644
index 679e465..0000000
--- a/aliroot-csa.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-package: AliRoot-csa
-version: "%(short_hash)s"
-requires:
-  - ROOT
-  - SAS
-env:
-  ALICE_ROOT: "$ALIROOT_ROOT"
-source: http://git.cern.ch/pub/AliRoot
-write_repo: https://git.cern.ch/reps/AliRoot 
-tag: master
----
-#!/bin/sh
-cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
-      -DCMAKE_C_COMPILER=`which ccc-analyzer` \
-      -DCMAKE_CXX_COMPILER=`which c++-analyzer`\
-      -DCMAKE_Fortran_COMPILER=`which gfortran` \
-      -DROOTSYS=$ROOT_ROOT \
-      -DALIEN=$ALIEN_ROOT/alien \
-      -DOCDB_INSTALL=PLACEHOLDER
-
-case $ARCHITECTURE in 
-  osx*) SONAME=dylib ;;
-esac
-
-scan-build -load-plugin $SAS_ROOT/lib/libSas.${SONAME:-so} \
-           -enable-checker sas.Performance \
-           -enable-checker sas.CodingConventions.General \
-           -enable-checker core \
-           -enable-checker cplusplus \
-           -enable-checker unix \
-           -o MyReportDir \
-           make -k ${JOBS+-j $JOBS} || true
diff --git a/aliroot-guntest.sh b/aliroot-guntest.sh
deleted file mode 100644
index 191d7c5..0000000
--- a/aliroot-guntest.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-package: AliRoot-guntest
-version: v1
-force_rebuild: 1
-requires:
-  - AliRoot
-  - AliRoot-OCDB
----
-#!/bin/bash -e
-
-# A simple regression test launching a Geant3 + Geant4 gun simulation + reconstruction.
-# Tests if the processing runs through and yields a reasonable ESD.
-# Note that the test is limited to the default OCDB.
-rsync -a "$ALIROOT_ROOT"/test/vmctest/gun test
-cd test/gun
-
-# launch the simulation
-./runtest.sh
-
-# test outcome and return the error code
-WITHESDCHECK=${ALIPHYSICS_VERSION:+yes} ./finalcheck.sh
diff --git a/aliroot-ocdb.sh b/aliroot-ocdb.sh
deleted file mode 100644
index 94fc640..0000000
--- a/aliroot-ocdb.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-package: AliRoot-OCDB
-source: https://gitlab.cern.ch/alisw/AliRootOCDB.git
-version: "%(short_hash)s"
-tag: master
----
-#!/bin/bash -e
-rsync -av --delete --exclude="**/.git" $SOURCEDIR/ $INSTALLROOT/
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv ALIROOT_OCDB_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-EoF
diff --git a/aliroot-test.sh b/aliroot-test.sh
deleted file mode 100644
index 2bf5692..0000000
--- a/aliroot-test.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-package: AliRoot-test
-version: "%(year)s%(month)s%(day)s%(defaults_upper)s"
-force_rebuild: 1
-requires:
-  - AliPhysics
-  - GEANT3
-  - OCDB-test
-  - "IgProf:slc7.*"
----
-#!/bin/sh
-export ALICE_ROOT=$ALIROOT_ROOT
-echo "`date +%s`:aliroot-test: $x STARTED"
-WORKSPACE=${WORKSPACE:-$BUILDDIR}
-
-# Uses the same setup as AliRoot
-if [[ $CMAKE_BUILD_TYPE == COVERAGE ]]; then
-  source $ALIROOT_ROOT/etc/gcov-setup.sh
-fi
-
-# Despite the fact we shouldn't rely on external variables, here we do to
-# control from the outside (i.e. jenkins) which tests to run.
-#
-# By default we only run gun. We do this so that before running longer tests we
-# make sure that at least the simple ones are ok.
-rsync -a $ALIROOT_ROOT/test/ test
-for x in ${ALI_CI_TESTS:-gun}; do
-  set -o pipefail
-  find test -name "*.C" -exec perl -p -i -e 's|ALICE_ROOT/OCDB|OCDB_TEST_ROOT|' {} \;
-  VARIANTS=default${IGPROF_ROOT:+,igprof_memory,igprof_performance}
-  if test/runTests -d --variants $VARIANTS $x; then
-    STATUS=SUCCESS
-  else
-    STATUS=FAILED
-  fi
-  # Process any igprof profile dump (performance).
-  for y in $(find . -name "igprof*PERFORMANCE.gz"); do
-    IGPROF_OUT=$(echo $y | sed -e's/.gz/.sql/')
-    igprof-analyse -d -g $y --sqlite | sqlite3 $IGPROF_OUT
-  done
-  # Process any igprof profile dump (memory).
-  for y in $(find . -name "igprof*MEMORY.gz"); do
-    igprof-analyse -d -r MEM_TOTAL -g $y --sqlite | sqlite3  $(echo $y | sed -e's/MEMORY.gz/MEM_TOTAL.sql/') || true
-    igprof-analyse -d -r MEM_LIVE -g $y --sqlite | sqlite3 $(echo $y | sed -e's/MEMORY.gz/MEM_LIVE.sql/') || true
-    igprof-analyse -d -r MEM_MAX -g $y --sqlite | sqlite3 $(echo $y | sed -e's/MEMORY.gz/MEM_MAX.sql/') || true
-  done
-  # Simple normalization of results. /etc/sysbench-results is created by
-  # puppet on build infrastructure machines.
-  if [ -f /etc/sysbench-results ]; then
-    NORMALIZATION=`cat /etc/sysbench-results | grep 'total time:' | sed -e 's/[^0-9]*//;s/s//'`
-  else
-    NORMALIZATION=1
-  fi
-  for y in $(find . -name "*.sql"); do
-    cat << EOF | sqlite3 $y
-      CREATE TABLE metadata (key STRING, value STRING);
-      INSERT INTO metadata(key, value) VALUES ('status', '$STATUS');
-      INSERT INTO metadata(key, value) VALUES ('test_name', '$x');
-      INSERT INTO metadata(key, value) VALUES ('architecture', '$ARCHITECTURE');
-      INSERT INTO metadata(key, value) VALUES ('aliroot_version', '$ALIROOT_VERSION');
-      INSERT INTO metadata(key, value) VALUES ('aliphysics_version', '$ALIPHYSICS_VERSION');
-      INSERT INTO metadata(key, value) VALUES ('hostname', '$HOSTNAME');
-      INSERT INTO metadata(key, value) VALUES ('normalization', '$NORMALIZATION');
-EOF
-  done
-  mkdir -p  ${WORKSPACE}/$x
-  find . -name "*.root" -exec cp {} $WORKSPACE/$x \;
-  find . -name "*.log" -exec cp {} $WORKSPACE/$x \;
-  find . -name "*.sql" -exec cp {} $WORKSPACE/$x \;
-  echo "`date +%s`:aliroot-test: $x $STATUS"
-done
diff --git a/aliroot.sh b/aliroot.sh
deleted file mode 100644
index 0de4865..0000000
--- a/aliroot.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-package: AliRoot
-version: "%(commit_hash)s%(defaults_upper)s"
-requires:
-  - ROOT
-  - DPMJET
-  - fastjet:(?!.*ppc64)
-  - GEANT3
-  - GEANT4_VMC
-  - Vc
-build_requires:
-  - CMake
-  - "Xcode:(osx.*)"
-env:
-  ALICE_ROOT: "$ALIROOT_ROOT"
-prepend_path:
-  ROOT_INCLUDE_PATH: "$ALIROOT_ROOT/include"
-source: https://github.com/alisw/AliRoot
-tag: master
-incremental_recipe: |
-  make ${JOBS:+-j$JOBS} install
-  ctest -R load_library --output-on-failure ${JOBS:+-j $JOBS}
-  rsync -a $SOURCEDIR/test/ $INSTALLROOT/test
-  [[ $CMAKE_BUILD_TYPE == COVERAGE ]] && mkdir -p "$WORK_DIR/$ARCHITECTURE/profile-data/AliRoot/$PKGVERSION-$PKGREVISION/" && rsync -acv --filter='+ */' --filter='+ *.cpp' --filter='+ *.cc' --filter='+ *.h' --filter='+ *.gcno' --filter='- *' "$BUILDDIR/" "$WORK_DIR/$ARCHITECTURE/profile-data/AliRoot/$PKGVERSION-$PKGREVISION/"
-  mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
----
-#!/bin/bash -e
-
-# Picking up ROOT from the system when ours is disabled
-[[ -z "$ROOT_ROOT" ]] && ROOT_ROOT="$(root-config --prefix)"
-
-# If building DAQ utilities verify environment integrity
-[[ $ALICE_DAQ ]] && ( source /date/setup.sh )
-
-# Generates an environment file to be loaded in case we need code coverage
-if [[ $CMAKE_BUILD_TYPE == COVERAGE ]]; then
-mkdir -p $INSTALLROOT/etc
-cat << EOF > $INSTALLROOT/etc/gcov-setup.sh
-export GCOV_PREFIX=${GCOV_PREFIX:-"$WORK_DIR/${ARCHITECTURE}/profile-data/AliRoot/$PKGVERSION-$PKGREVISION"}
-export GCOV_PREFIX_STRIP=$(echo $INSTALLROOT | sed -e 's|/$||;s|^/||;s|//*|/|g;s|[^/]||g' | wc -c | sed -e 's/[^0-9]*//')
-EOF
-source $INSTALLROOT/etc/gcov-setup.sh
-fi
-
-cmake $SOURCEDIR                                                     \
-      -DCMAKE_INSTALL_PREFIX="$INSTALLROOT"                          \
-      -DROOTSYS="$ROOT_ROOT"                                         \
-      ${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE"}    \
-      ${ALIEN_RUNTIME_ROOT:+-DALIEN="$ALIEN_RUNTIME_ROOT"}           \
-      ${FASTJET_ROOT:+-DFASTJET="$FASTJET_ROOT"}                     \
-      ${DPMJET_ROOT:+-DDPMJET="$DPMJET_ROOT"}                        \
-      ${ZEROMQ_ROOT:+-DZEROMQ=$ZEROMQ_ROOT}                          \
-      ${ALICE_DAQ:+-DDA=ON -DDARPM=ON -DdaqDA=$DAQ_DALIB}            \
-      ${ALICE_DAQ:+-DAMORE_CONFIG=$AMORE_CONFIG}                     \
-      ${ALICE_DAQ:+-DDATE_CONFIG=$DATE_CONFIG}                       \
-      ${ALICE_DAQ:+-DDATE_ENV=$DATE_ENV}                             \
-      ${ALICE_DAQ:+-DDIMDIR=$DAQ_DIM -DODIR=linux}                   \
-      ${ALICE_SHUTTLE:+-DDIMDIR=$HOME/dim -DODIR=linux}              \
-      ${ALICE_SHUTTLE:+-DSHUTTLE=ON -DApMon=$ALIEN_RUNTIME_ROOT}     \
-      -DOCDB_INSTALL=PLACEHOLDER
-
-make ${IGNORE_ERRORS:+-k} ${JOBS+-j $JOBS} install
-# ctest will succeed if no load_library tests were found
-ctest -R load_library --output-on-failure ${JOBS:+-j $JOBS}
-[[ $ALICE_DAQ && ! $ALICE_DISABLE_DA_RPMS ]] && { make daqDA-all-rpm && make ${JOBS+-j $JOBS} install; }
-
-rsync -av $SOURCEDIR/test/ $INSTALLROOT/test
-
-[[ $CMAKE_BUILD_TYPE == COVERAGE ]]                                                       \
-  && mkdir -p "$WORK_DIR/${ARCHITECTURE}/profile-data/AliRoot/$PKGVERSION-$PKGREVISION/"  \
-  && rsync -acv --filter='+ */' --filter='+ *.c' --filter='+ *.cxx' --filter='+ *.cpp' --filter='+ *.cc' --filter='+ *.hpp' --filter='+ *.h' --filter='+ *.gcno' --filter='- *' "$BUILDDIR/" "$WORK_DIR/${ARCHITECTURE}/profile-data/AliRoot/$PKGVERSION-$PKGREVISION/"
-
-# Modulefile
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${ROOT_VERSION:+ROOT/$ROOT_VERSION-$ROOT_REVISION} ${DPMJET_VERSION:+DPMJET/$DPMJET_VERSION-$DPMJET_REVISION} ${FASTJET_VERSION:+fastjet/$FASTJET_VERSION-$FASTJET_REVISION} ${GEANT3_VERSION:+GEANT3/$GEANT3_VERSION-$GEANT3_REVISION} ${GEANT4_VMC_VERSION:+GEANT4_VMC/$GEANT4_VMC_VERSION-$GEANT4_VMC_REVISION} ${VC_VERSION:+Vc/$VC_VERSION-$VC_REVISION}
-# Our environment
-setenv ALIROOT_VERSION \$version
-setenv ALICE \$::env(BASEDIR)/$PKGNAME
-setenv ALIROOT_RELEASE \$::env(ALIROOT_VERSION)
-setenv ALICE_ROOT \$::env(BASEDIR)/$PKGNAME/\$::env(ALIROOT_RELEASE)
-prepend-path PATH \$::env(ALICE_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(ALICE_ROOT)/lib
-prepend-path ROOT_INCLUDE_PATH \$::env(ALICE_ROOT)/include
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(ALICE_ROOT)/lib")
-EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
diff --git a/apmon-cpp.sh b/apmon-cpp.sh
deleted file mode 100644
index 21e1964..0000000
--- a/apmon-cpp.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-package: ApMon-CPP
-version: "%(tag_basename)s"
-tag: v2.2.8
-source: https://github.com/alisw/apmon-cpp.git
-build_requires:
- - autotools
- - "GCC-Toolchain:(?!osx)"
----
-#!/bin/bash -e
-rsync -a --exclude='**/.git' --delete --delete-excluded \
-      $SOURCEDIR/ ./
-autoreconf -ivf
-./configure --prefix=$INSTALLROOT
-make ${JOBS:+-j$JOBS}
-make install
-
-# Modules
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 \\
-       ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
-# Our environment
-setenv APMON_CPP_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path LD_LIBRARY_PATH \$::env(APMON_CPP_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(APMON_CPP_ROOT)/lib")
-EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
diff --git a/arrow.sh b/arrow.sh
deleted file mode 100644
index 5b31188..0000000
--- a/arrow.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-package: arrow
-version: 3fdeac74c80593ebde7a8eeb148cea9f6e0d1b38
-source: https://github.com/apache/arrow
-requires:
-  - flatbuffers
-  - boost
-build_requires:
- - CMake
- - "GCC-Toolchain:(?!osx)"
----
-mkdir -p $INSTALLROOT
-case $ARCHITECTURE in
-  osx*)
-    # If we preferred system tools, we need to make sure we can pick them up.
-    [[ ! $FLATBUFFERS_ROOT ]] && FLATBUFFERS_ROOT=`brew --prefix flatbuffers`
-    [[ ! $BOOST_ROOT ]] && BOOST_ROOT=`brew --prefix boost`
-  ;;
-esac
-
-FLATBUFFERS_HOME=$FLATBUFFERS_ROOT            \
-cmake $SOURCEDIR/cpp                          \
-      -DARROW_BUILD_BENCHMARKS=OFF            \
-      -DARROW_BUILD_TESTS=OFF                 \
-      -DARROW_JEMALLOC=OFF                    \
-      -DBOOST_ROOT=$BOOST_ROOT                \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT     \
-      -DARROW_PYTHON=OFF
-
-make ${JOBS:+-j $JOBS}
-make install
-
-#ModuleFil
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION}
-# Our environment
-setenv ARRAW_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path LD_LIBRARY_PATH \$::env(ARRAW_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(ARRAW_ROOT)/lib")
-prepend-path PATH \$::env(ARRAW_ROOT)/bin
-EoF
diff --git a/asiofi.sh b/asiofi.sh
index b771e38..fdb6015 100644
--- a/asiofi.sh
+++ b/asiofi.sh
@@ -53,5 +53,3 @@ prepend-path LD_LIBRARY_PATH \$ASIOFI_ROOT/lib
 EoF
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 mkdir -p $MODULEDIR && rsync -a --delete etc/modulefiles/ $MODULEDIR
-
-
diff --git a/bz2.sh b/bz2.sh
index b6cd985..f001a95 100644
--- a/bz2.sh
+++ b/bz2.sh
@@ -8,4 +8,3 @@ system_requirement: ".*"
 system_requirement_check: |
   printf "#include <bzlib.h>\n" | gcc -xc++ - -c -o /dev/null
 ---
-
diff --git a/cern-get-sso-cookie.sh b/cern-get-sso-cookie.sh
deleted file mode 100644
index 2720d12..0000000
--- a/cern-get-sso-cookie.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-package: cern-get-sso-cookie
-version: "1.0"
-source: https://github.com/ktf/cern-get-sso-cookie
-prefer_system: .*
-prefer_system_check: which cern-get-sso-cookie
----
-#!/bin/bash -ex
-
-curl http://cpanmin.us | perl - -l $INSTALLROOT local::lib Authen::Krb5 WWW::Curl::Easy
-mkdir -p $INSTALLROOT/bin $INSTALLROOT/lib/perl5/WWW/CERNSSO
-cp $SOURCEDIR/cern-get-sso-cookie/usr/share/perl5/WWW/CERNSSO/Auth.pm $INSTALLROOT/lib/perl5/WWW/CERNSSO/Auth.pm
-cp $SOURCEDIR/cern-get-sso-cookie/usr/bin/cern-get-sso-cookie $INSTALLROOT/bin
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv PERL_MODULES_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH $::env(PERL_MODULES_ROOT)/bin
-prepend-path LD_LIBRARY_PATH $::env(PERL_MODULES_ROOT)/lib
-prepend-path PERL5LIB $::env(PERL_MODULES_ROOT)/lib/perl5
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH $::env(PERL_MODULES_ROOT)/lib")
-EoF
diff --git a/clhep.sh b/clhep.sh
index a273f85..3d1b3ff 100644
--- a/clhep.sh
+++ b/clhep.sh
@@ -6,6 +6,6 @@ tag: CLHEP_2_2_0_8
 #!/bin/sh
 cmake $SOURCEDIR \
   -DCMAKE_INSTALL_PREFIX:PATH="$INSTALLROOT"
-  
+
 make ${JOBS+-j $JOBS}
 make install
diff --git a/configuration.sh b/configuration.sh
index 1be4f9f..51e3707 100644
--- a/configuration.sh
+++ b/configuration.sh
@@ -40,7 +40,7 @@ proc ModulesHelp { } {
 set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
 module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
 # Dependencies
-module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION}  ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} protobuf/$PROTOBUF_VERSION-$PROTOBUF_REVISION grpc/$GRPC_VERSION-$GRPC_REVISION 
+module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION}  ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} protobuf/$PROTOBUF_VERSION-$PROTOBUF_REVISION grpc/$GRPC_VERSION-$GRPC_REVISION
 # Our environment
 setenv Configuration_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 prepend-path PATH \$::env(Configuration_ROOT)/bin
diff --git a/cpprestsdk.sh b/cpprestsdk.sh
deleted file mode 100644
index 061bc53..0000000
--- a/cpprestsdk.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-package: cpprestsdk
-version: master
-source: https://github.com/Microsoft/cpprestsdk
-requires:
-- boost
-build_requires:
-- CMake
-tag: master
----
-#!/bin/sh
-
-case $ARCHITECTURE in
-  osx*) BOOST_ROOT=$(brew --prefix boost) ;;
-esac
-
-cmake "$SOURCEDIR/Release"                      \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT       \
-      -DBUILD_TESTS=OFF                         \
-      -DBUILD_SAMPLES=OFF                       \
-      -DCMAKE_BUILD_TYPE=Debug
-
-make ${JOBS:+-j $JOBS}
-make install
-
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv CPPRESTSDK_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path LD_LIBRARY_PATH \$::env(CPPRESTSDK_ROOT)/lib
-EoF
diff --git a/dds.sh b/dds.sh
deleted file mode 100644
index e7f0f92..0000000
--- a/dds.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-package: DDS
-version: "master-%(short_hash)s"
-source: https://github.com/FairRootGroup/DDS
-requires:
-  - boost
-build_requires:
-  - CMake
-tag: "1.4"
----
-#!/bin/sh
-
-case $ARCHITECTURE in
-  osx*) BOOST_ROOT=$(brew --prefix boost) ;;
-esac
-
-cmake $SOURCEDIR                                              \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT                     \
-      ${BOOST_ROOT:+-DBOOST_ROOT=$BOOST_ROOT}                 \
-      ${BOOST_ROOT:+-DBoost_DIR=$BOOST_ROOT}                  \
-      ${BOOST_ROOT:+-DBoost_INCLUDE_DIR=$BOOST_ROOT/include}
-
-make ${JOBS+-j 1} wn_bin; make ${JOBS+-j 1} install
-
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION}  ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
-# Our environment
-setenv DDS_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(DDS_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(DDS_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(DDS_ROOT)/lib")
-EoF
diff --git a/defaults-release.sh b/defaults-release.sh
index 4d6f410..ab65f92 100644
--- a/defaults-release.sh
+++ b/defaults-release.sh
@@ -5,12 +5,6 @@ env:
   CFLAGS: "-fPIC -g -O2"
   CMAKE_BUILD_TYPE: "RELEASE"
   CMAKE_CXX_STANDARD: "17"
-disable:
-  - AliEn-Runtime
-  - MonALISA-gSOAP-client
-  - AliEn-CAs
-  - ApMon-CPP
-  - DDS
 overrides:
   autotools:
     tag: v1.6.3
@@ -142,7 +136,7 @@ overrides:
       true
   log4cpp:
     tag: 1b9f8f7c031d6947c7468d54bc1da4b2f414558d
-    prefer_system_check: | 
+    prefer_system_check: |
       ls $LOG4CPP_ROOT/include/ > /dev/null && \
       ls $LOG4CPP_ROOT/lib/ > /dev/null && \
       true
@@ -257,7 +251,7 @@ overrides:
       ls $LHAPDF5_ROOT/lib/libLHAPDF.la > /dev/null && \
       ls $LHAPDF5_ROOT/lib/libLHAPDF.a > /dev/null && \
       ls $LHAPDF5_ROOT/lib64/python2.7/site-packages/lhapdf.py > /dev/null && \
-      ls $LHAPDF5_ROOT/share/lhapdf > /dev/null 
+      ls $LHAPDF5_ROOT/share/lhapdf > /dev/null
   XercesC:
     prefer_system_check: |
       ls $XERCESC_ROOT/ > /dev/null && \
diff --git a/epos-test.sh b/epos-test.sh
deleted file mode 100644
index 0774877..0000000
--- a/epos-test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-package: EPOS-test
-version: v1
-force_rebuild: 1
-requires:
-  - EPOS
----
-#!/bin/bash -ex
-export OPT=$PWD
-export CHK=$PWD
-cp "$EPO"/test/bp5nohnoc10n10f.optns .
-cp "$EPO"/test/iclbp.optns .
-epos bp5nohnoc10n10f
-[ -f z-bp5nohnoc10n10f.root ]
diff --git a/epos.sh b/epos.sh
deleted file mode 100644
index 608f403..0000000
--- a/epos.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-package: EPOS
-version: "%(tag_basename)s%(defaults_upper)s"
-tag: alice/v3.111
-source: https://gitlab.cern.ch/ALICEPrivateExternals/epos.git
-requires:
-  - ROOT
-  - fastjet
-env:
-  EPOVSN: "${EPOS_VERSION/./}"
-  EPO: "${EPOS_ROOT}/epos/"
----
-#!/bin/bash -ex
-
-export EPOVSN=${PKGVERSION/./}
-
-# The following two variables *must* have a trailing slash! EPOS installation
-# will make a mess otherwise.
-export EPO=$PWD/
-export OBJ=$EPO/Unu/Lib/
-
-rsync -a --exclude='**/.git' --delete ${SOURCEDIR}/ .
-mkdir $OBJ
-
-export LDFLAGS="-Wl,--no-as-needed -L${MPFR_ROOT}/lib -L${GMP_ROOT}/lib -L${CGAL_ROOT}/lib"
-export LIBRARY_PATH="$LD_LIBRARY_PATH"
-make LFLAGS="$LDFLAGS"
-
-# "Install"
-INST_SUBROOT=$INSTALLROOT/epos
-mkdir -p $INST_SUBROOT \
-         $INSTALLROOT/bin
-rsync -a \
-      --exclude='**/bin' \
-      --exclude='**/.git' \
-      --exclude=*.f \
-      --exclude=*.o \
-      --exclude=*.h \
-      --exclude=*.c \
-      --exclude=*.cpp \
-      --exclude=Makefile \
-      ./ $INST_SUBROOT/
-rsync -a bin/ $INSTALLROOT/bin/
-find $INSTALLROOT -type d -empty -exec rmdir '{}' \; > /dev/null 2>&1 || true
-[ -d "$INST_SUBROOT/Unu/Lib/epos$EPOVSN" ]
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ROOT/$ROOT_VERSION-$ROOT_REVISION fastjet/$FASTJET_VERSION-$FASTJET_REVISION
-# Our environment
-setenv EPOS_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH $::env(EPOS_ROOT)/bin
-setenv EPOVSN ${EPOVSN}
-# Final slash is required by EPOS, please leave it be
-setenv EPO $::env(EPOS_ROOT)/epos/
-EoF
diff --git a/evtgen.sh b/evtgen.sh
index 0927e3f..56c51f4 100644
--- a/evtgen.sh
+++ b/evtgen.sh
@@ -16,9 +16,9 @@ export  HEPMCLOCATION="$HEPMC_ROOT"
 
 rsync -a $SOURCEDIR/* .
 
-./configure --hepmcdir=$HEPMC_ROOT --pythiadir=$PYTHIA_ROOT --tauoladir=$TAUOLAPP_ROOT --photosdir=$PHOTOSPP_ROOT --prefix=$INSTALLROOT CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" 
+./configure --hepmcdir=$HEPMC_ROOT --pythiadir=$PYTHIA_ROOT --tauoladir=$TAUOLAPP_ROOT --photosdir=$PHOTOSPP_ROOT --prefix=$INSTALLROOT CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS"
 
-make 
+make
 make install
 
 # Modulefile
diff --git a/fairlogger.sh b/fairlogger.sh
index 4e88261..77f739e 100644
--- a/fairlogger.sh
+++ b/fairlogger.sh
@@ -58,4 +58,3 @@ prepend-path ROOT_INCLUDE_PATH \$FAIRLOGGER_ROOT/include
 EoF
 MODULEDIR="$INSTALLROOT/etc/modulefiles"
 mkdir -p $MODULEDIR && rsync -a --delete etc/modulefiles/ $MODULEDIR
-
diff --git a/flatbuffers.sh b/flatbuffers.sh
index 0feee67..c3b3798 100644
--- a/flatbuffers.sh
+++ b/flatbuffers.sh
@@ -43,4 +43,3 @@ prepend-path PATH \$FLATBUFFERS_ROOT/bin
 prepend-path LD_LIBRARY_PATH \$FLATBUFFERS_ROOT/lib
 prepend-path PATH \$FLATBUFFERS_ROOT/bin
 EoF
-
diff --git a/flpproto.sh b/flpproto.sh
deleted file mode 100644
index d5a924b..0000000
--- a/flpproto.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-package: flpproto
-requires:
-  - Monitoring
-  - Configuration
-  - O2
-  - "GCC-Toolchain:(?!osx)"
-  - "PDA:slc7.*"
-  - "dim:(?!osx)"
-build_requires:
-  - CMake
-  - MySQL
-source: https://github.com/AliceO2Group/FlpPrototype
-version: "%(tag_basename)s"
-tag: v0.4.6
-incremental_recipe: |
-  make ${JOBS:+-j$JOBS} install
-  mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
-
----
-#!/bin/sh
-
-# Making sure people do not have SIMPATH set when they build fairroot.
-# Unfortunately SIMPATH seems to be hardcoded in a bunch of places in
-# fairroot, so this really should be cleaned up in FairRoot itself for
-# maximum safety.
-unset SIMPATH
-
-case $ARCHITECTURE in
-  osx*)
-    # If we preferred system tools, we need to make sure we can pick them up.
-    [[ ! $BOOST_ROOT ]] && BOOST_ROOT=`brew --prefix boost`
-    [[ ! $ZEROMQ_ROOT ]] && ZEROMQ_ROOT=`brew --prefix zeromq`
-    [[ ! $GSL_ROOT ]] && GSL_ROOT=`brew --prefix gsl`
-    [[ ! $PROTOBUF_ROOT ]] && PROTOBUF_ROOT=`brew --prefix protobuf`
-    SONAME=dylib
-  ;;
-  *) SONAME=so ;;
-esac
-
-cmake $SOURCEDIR                                              \
-    -DCMAKE_INSTALL_PREFIX=$INSTALLROOT                     \
-    -DCMAKE_MODULE_PATH="$SOURCEDIR/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules_old" \
-    ${BOOST_ROOT:+-DBOOST_ROOT=$BOOST_ROOT}     \
-    -DFAIRROOTPATH=$FAIRROOT_ROOT \
-    -DFairRoot_DIR=$FAIRROOT_ROOT                               \
-    -DROOTSYS=$ROOTSYS \
-    ${CONFIGURATION_VERSION:+-DConfiguration_ROOT=$CONFIGURATION_ROOT} \
-    ${MONITORING_VERSION:+-DMonitoring_ROOT=$MONITORING_ROOT} \
-    ${PDA_VERSION:+-DPDA_ROOT=$PDA_ROOT} \
-    ${DIM_VERSION:+-DDIM_ROOT=$DIM_ROOT}
-
-make ${JOBS+-j $JOBS} install
-
-#ModuleFile
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-
-# Dependencies
-module load BASE/1.0                                                                            \\
-            ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} \\
-            O2/$O2_VERSION-$O2_REVISION                                                         \\
-            Monitoring/$MONITORING_VERSION-$MONITORING_REVISION                                 \\
-            Configuration/$CONFIGURATION_VERSION-$CONFIGURATION_REVISION                        \\
-            PDA/$PDA_VERSION-$PDA_REVISION                                                      \\
-            dim/$DIM_VERSION-$DIM_REVISION                   
-
-# Our environment
-setenv FLPPROTO_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(BASEDIR)/$PKGNAME/\$version/bin
-prepend-path LD_LIBRARY_PATH \$::env(BASEDIR)/$PKGNAME/\$version/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(BASEDIR)/$PKGNAME/\$version/lib")
-EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
-
diff --git a/fmt.sh b/fmt.sh
index dd02d86..2b32dfa 100644
--- a/fmt.sh
+++ b/fmt.sh
@@ -33,4 +33,3 @@ module load BASE/1.0 ${GCC_TOOLCHAIN_REVISION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERS
 set FMT_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 prepend-path ROOT_INCLUDE_PATH \$FMT_ROOT/include
 EoF
-
diff --git a/g4py.sh b/g4py.sh
index 3ddb86a..9653f48 100644
--- a/g4py.sh
+++ b/g4py.sh
@@ -25,7 +25,7 @@ cmake $INSTALLROOT                                 \
       ${BOOST_VERSION:+-DBoost_NO_SYSTEM_PATH=TRUE}\
       -DXERCESC_ROOT_DIR=${XERCESC_ROOT}           \
       -DCMAKE_VERBOSE_MAKEFILE=TRUE                \
-      -DBoost_NO_BOOST_CMAKE=TRUE 
+      -DBoost_NO_BOOST_CMAKE=TRUE
 
 make ${JOBS:+-j $JOBS}
 make install
diff --git a/geantv.sh b/geantv.sh
deleted file mode 100644
index 93560b8..0000000
--- a/geantv.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-package: GEANTV
-version: "%(tag_basename)s%(defaults_upper)s"
-source: https://gitlab.cern.ch/GeantV/geant.git
-tag: master
-requires:
-  - "GCC-Toolchain:(?!osx)"
-  - VecGeom
-  - HepMC3
-  - pythia
-  - Vc
-  - GEANT4
-build_requires:
-  - CMake
----
-#!/bin/bash -e
-cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT  \
-      -DUSE_VECGEOM_NAVIGATOR=ON                       \
-      -DVecGeom_DIR=$VECGEOM_ROOT/lib/CMake/VecGeom    \
-      -DUSE_ROOT=ON                                    \
-      -DHepMC_DIR=$HEPMC3_ROOT/cmake/                  \
-      -DPYTHIA8_ROOT_DIR=$PYTHIA_ROOT                  \
-      -DCMAKE_PREFIX_PATH=$VC_ROOT/lib/cmake/Vc
-
-make ${JOBS+-j $JOBS}
-make install
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 Pythia/$PYTHIA_VERSION-$PYTHIA_REVISION Vc/$VC_VERSION-$VC_REVISION VecGeom/$VECGEOM_VERSION-$VECGEOM_REVISION GEANT4/$GEANT4_VERSION-$GEANT4_REVISION HepMC3/$HEPMC3_VERSION-$HEPMC3_REVISION
-# Our environment
-set osname [uname sysname]
-setenv GEANTV_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(GEANTV_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(GEANTV_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(GEANTV_ROOT)/lib")
-EoF
diff --git a/geekbench.sh b/geekbench.sh
deleted file mode 100644
index 3daed63..0000000
--- a/geekbench.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-package: Geekbench
-version: v3.4.1
-source: https://gitlab.cern.ch/ALICEPrivateExternals/Geekbench.git
----
-#!/bin/bash
-if [[ ${ARCHITECTURE:0:3} == osx ]]; then
-  echo "Geekbench is not provided for OSX via this recipe."
-  exit 1
-fi
-mkdir -p "$INSTALLROOT/bin"
-rsync -av "$SOURCEDIR/Linux/" "$INSTALLROOT/bin"
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv GEEKBENCH_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(GEEKBENCH_ROOT)/bin
-EoF
diff --git a/genie.sh b/genie.sh
index 0f5c935..dd5c6a8 100644
--- a/genie.sh
+++ b/genie.sh
@@ -42,7 +42,7 @@ $BUILDDIR/configure --prefix=$INSTALLROOT \
 		    --with-log4cpp-inc=$LOG4CPP_ROOT/include/ \
 		    --with-log4cpp-lib=$LOG4CPP_ROOT/lib/ \
 		    --with-apfel-inc=$APFEL_ROOT/include/ \
-		    --with-apfel-lib=$APFEL_ROOT/lib/ 
+		    --with-apfel-lib=$APFEL_ROOT/lib/
 
 
 make CXXFLAGS="-Wall $CXXFLAGS" CFLAGS="-Wall $CFLAGS"
@@ -86,5 +86,5 @@ prepend-path LD_LIBRARY_PATH \$::env(GENIE_ROOT)/genie/lib
 prepend-path ROOT_INCLUDE_PATH \$::env(GENIE_ROOT)/genie/inc
 prepend-path ROOT_INCLUDE_PATH \$::env(GENIE_ROOT)/genie/src
 $([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(GENIE_ROOT)/lib")
-append-path PATH \$::env(GENIE_ROOT)/genie/bin 
+append-path PATH \$::env(GENIE_ROOT)/genie/bin
 EoF
diff --git a/glog.sh b/glog.sh
deleted file mode 100644
index 7cd35e9..0000000
--- a/glog.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-package: glog
-version: v0.3.4
-source: https://github.com/google/glog
-build_requires:
- - autotools
- - "GCC-Toolchain:(?!osx)"
---- 
-rsync -av --delete --exclude="**/.git" $SOURCEDIR/ .
-autoreconf -ivf
-./configure --prefix="$INSTALLROOT"
-make ${JOBS:+-j $JOBS}
-make install
-
-#ModuleFile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv PROTOBUF_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path LD_LIBRARY_PATH \$::env(PROTOBUF_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(PROTOBUF_ROOT)/lib")
-prepend-path PATH \$::env(PROTOBUF_ROOT)/bin
-EoF
diff --git a/go.sh b/go.sh
index 22434e8..1bb2de7 100644
--- a/go.sh
+++ b/go.sh
@@ -52,4 +52,3 @@ module load BASE/1.0
 setenv GOROOT \$::env(BASEDIR)/$PKGNAME/\$version
 prepend-path PATH \$::env(GOROOT)/bin
 EoF
-
diff --git a/gsoap.sh b/gsoap.sh
index 36ef43b..7baa191 100644
--- a/gsoap.sh
+++ b/gsoap.sh
@@ -13,7 +13,7 @@ rsync -a --exclude='**/.git' --delete --delete-excluded \
       $SOURCEDIR/ ./
 
 # On mac we use openssl coming from homebrew.
-case $ARCHITECTURE in 
+case $ARCHITECTURE in
   osx*)
     [ ! "X$OPENSSL_ROOT" = X ] || OPENSSL_ROOT=`brew --prefix openssl`
   ;;
diff --git a/hijing.sh b/hijing.sh
deleted file mode 100644
index 8e93fe3..0000000
--- a/hijing.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-# a pythia6 recipe based on the one from FairROOT
-package: hijing
-version: "%(tag_basename)s%(defaults_upper)s"
-tag: "v1.36"
-source: https://github.com/alisw/hijing.git
-build_requires:
-  - CMake
-
----
-#!/bin/sh
-cmake ${SOURCEDIR}                           \
-      -DCMAKE_INSTALL_PREFIX=${INSTALLROOT}
-
-make ${JOBS+-j$JOBS}
-make install
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv HIJING_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path LD_LIBRARY_PATH \$::env(HIJING_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(HIJING_ROOT)/lib")
-EoF
-
diff --git a/igprof-packaging.sh b/igprof-packaging.sh
deleted file mode 100644
index 9a77df5..0000000
--- a/igprof-packaging.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-package: IgProf-packaging
-version: master
-source: https://github.com/alisw/ali-bot
-force_rebuild: 1
-requires:
-  - IgProf
----
-#!/bin/sh
-mkdir -p igprof/usr libunwind/usr libatomic_ops/usr
-tar xzf /sw/TARS/$ARCHITECTURE/IgProf/IgProf-$IGPROF_VERSION-$IGPROF_REVISION.$ARCHITECTURE.tar.gz --strip-components=4 -C igprof/usr
-tar xzf /sw/TARS/$ARCHITECTURE/libunwind/libunwind-$LIBUNWIND_VERSION-$LIBUNWIND_REVISION.$ARCHITECTURE.tar.gz --strip-components=4 -C libunwind/usr
-tar xzf /sw/TARS/$ARCHITECTURE/libatomic_ops/libatomic_ops-$LIBATOMIC_OPS_VERSION-$LIBATOMIC_OPS_REVISION.$ARCHITECTURE.tar.gz --strip-components=4 -C libatomic_ops/usr
-
-RPM_LIBATOMIC_OPS_VERSION=`echo $LIBATOMIC_OPS_VERSION | tr - _`
-
-case $ARCHITECTURE in
-  ubuntu*) 
-    RPM_LIBATOMIC_OPS_VERSION=$LIBATOMIC_OPS_VERSION
-    RPM_LIBATOMIC_OPS_NAME=libatomic-ops
-    PACKAGE_FORMAT=deb 
-    ARCH_SEP=_
-    VERSION_SEP=_
-    RPM_ARCH=amd64
-    apt-get install -y python-requests ruby-dev
-    gem install --no-ri --no-rdoc fpm
-  ;;
-  *) 
-    RPM_LIBATOMIC_OPS_VERSION=`echo $LIBATOMIC_OPS_VERSION | tr - _`
-    RPM_LIBUNWIND_VERSION=`echo $LIBUNWIND_VERSION | tr - _`
-    RPM_LIBATOMIC_OPS_NAME=libatomic_ops
-    PACKAGE_FORMAT=rpm 
-    ARCH_SEP=.
-    VERSION_SEP=-
-    RPM_ARCH=x86_64
-    yum install -y python-requests
-  ;;
-esac
-
-cat << EOF > post-install
-#!/bin/sh
-ldconfig
-EOF
-
-fpm -s dir -t $PACKAGE_FORMAT \
-    --after-install post-install \
-    -d "libunwind = `echo $RPM_LIBUNWIND_VERSION | tr - _`" \
-    --iteration $IGPROF_REVISION \
-    -a $RPM_ARCH \
-    -v $IGPROF_VERSION \
-    -n igprof \
-    -C igprof \
-    usr/bin usr/lib usr/include
-
-fpm -s dir -t $PACKAGE_FORMAT --iteration $LIBUNWIND_REVISION -a $RPM_ARCH -v $RPM_LIBUNWIND_VERSION -n libunwind -C libunwind usr/lib usr/include
-fpm -s dir -t $PACKAGE_FORMAT --iteration $LIBATOMIC_OPS_REVISION -a $RPM_ARCH -v $LIBATOMIC_OPS_VERSION -n libatomic_ops -C libatomic_ops usr/lib usr/include
-
-cat << EOF > packaging.yaml
-architecture: $ARCHITECTURE
-organization: igprof
-description: IgProf test repository
-format: $PACKAGE_FORMAT
-labels:
-  - profiling
-  - development
-packages:
-  - name: igprof
-    version: $IGPROF_VERSION
-    file: igprof$VERSION_SEP$IGPROF_VERSION-$IGPROF_REVISION$ARCH_SEP$RPM_ARCH.$PACKAGE_FORMAT
-    licenses: 
-      - GPL-2.0
-    vcs_url: "https://github.com/igprof/igprof.git"
-    website_url: http://igprof.org
-    labels: 
-      - profiling
-      - development
-  - name: libunwind
-    version: $LIBUNWIND_VERSION
-    file: libunwind$VERSION_SEP$RPM_LIBUNWIND_VERSION-$LIBUNWIND_REVISION$ARCH_SEP$RPM_ARCH.$PACKAGE_FORMAT
-    licenses: 
-      - GPL-2.0
-    vcs_url: "https://github.com/igprof/libunwind"
-    labels: 
-      - profiling
-      - development
-  - name: libatomic_ops
-    version: $RPM_LIBATOMIC_OPS_VERSION
-    file: $RPM_LIBATOMIC_OPS_NAME$VERSION_SEP$RPM_LIBATOMIC_OPS_VERSION-$LIBATOMIC_OPS_REVISION$ARCH_SEP$RPM_ARCH.$PACKAGE_FORMAT
-    licenses: 
-      - GPL-2.0
-    vcs_url: "https://github.com/igprof/libatomic_ops"
-    labels: 
-      - profiling
-      - development
-level: test
-EOF
-
-ls
-$SOURCEDIR/upload-bintray-distribution -u ktf packaging.yaml
diff --git a/igprof.sh b/igprof.sh
deleted file mode 100644
index 65ced18..0000000
--- a/igprof.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-package: IgProf
-version: 5.9.16
-source: https://github.com/igprof/igprof
-tag: v5.9.16
-requires:
-  - libunwind
-  - CMake
----
-#!/bin/sh
-
-cmake $SOURCEDIR \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \
-      -DUNWIND_INCLUDE_DIR=$LIBUNWIND_ROOT/include \
-      -DUNWIND_LIBRARY=$LIBUNWIND_ROOT/lib/libunwind.so \
-      -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-g -O3 -U_FORTIFY_SOURCE -Wno-attributes"
-make ${JOBS+-j $JOBS}
-make install
diff --git a/lcov.sh b/lcov.sh
index 7ccde84..8123a7b 100644
--- a/lcov.sh
+++ b/lcov.sh
@@ -26,4 +26,3 @@ setenv LCOV_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
 prepend-path LD_LIBRARY_PATH \$::env(LCOV_ROOT)/lib
 $([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(LCOV_ROOT)/lib")
 EoF
-
diff --git a/libatomic_ops.sh b/libatomic_ops.sh
deleted file mode 100644
index b87cefe..0000000
--- a/libatomic_ops.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-package: libatomic_ops
-version: libatomic_ops-7_4_2
-source: https://github.com/ivmai/libatomic_ops/
-tag: master
-build_requires:
-  - autotools:(slc[56].*|ubt.*)
----
-#!/bin/sh
-rsync -a $SOURCEDIR/ ./
-libtoolize
-autoreconf -ivf
-./configure --prefix=$INSTALLROOT
-
-make ${JOBS+-j $JOBS}
-make install
diff --git a/libperl.sh b/libperl.sh
index aa37920..f49f580 100644
--- a/libperl.sh
+++ b/libperl.sh
@@ -5,4 +5,3 @@ system_requirement: ".*"
 system_requirement_check: |
   printf "#include <EXTERN.h>\nint main(){}\n" | cc -xc -lperl -L`perl -MConfig -e 'print $Config{archlib}'`/CORE -I`perl -MConfig -e 'print $Config{archlib}'`/CORE - -o /dev/null && perl -MExtUtils::Embed -e 1
 ---
-
diff --git a/make.sh b/make.sh
index 9746bd6..3c6002c 100644
--- a/make.sh
+++ b/make.sh
@@ -8,4 +8,3 @@ system_requirement: ".*"
 system_requirement_check: |
   type make
 ---
-
diff --git a/mesos-dds.sh b/mesos-dds.sh
deleted file mode 100644
index 94ddea6..0000000
--- a/mesos-dds.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-package: mesos-dds
-version: master
-source: https://github.com/alisw/mesos-dds
-requires:
-- mesos
-- protobuf
-- boost
-- glog
-- cpprestsdk
-- DDS
-build_requires:
-- CMake
-tag: master
----
-#!/bin/sh
-
-case $ARCHITECTURE in
-  osx*)
-    [[ ! $BOOST_ROOT ]] && BOOST_ROOT=$(brew --prefix boost)
-    [[ ! $MESOS_ROOT ]] && MESOS_ROOT=$(brew --prefix mesos)
-  ;;
-esac
-
-cmake "$SOURCEDIR"                               \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT        \
-      -DPROTOBUF_ROOT=${PROTOBUF_ROOT}           \
-      ${MESOS_ROOT:+-DMESOS_ROOT=${MESOS_ROOT}}  \
-      ${BOOST_ROOT:+-DBOOST_ROOT=${BOOST_ROOT}}  \
-      -DGLOG_ROOT=${GLOG_ROOT}                   \
-      -DCPPRESTSDK_ROOT=${CPPRESTSDK_ROOT}       \
-      -DDDS_ROOT=${DDS_ROOT}
-
-make ${JOBS:+-j $JOBS}
-make install
-
diff --git a/mesos-workqueue.sh b/mesos-workqueue.sh
deleted file mode 100644
index 416a0f5..0000000
--- a/mesos-workqueue.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-package: mesos-workqueue
-version: 0.0.2-%(short_hash)s
-source: https://github.com/alisw/mesos-workqueue
-tag: master
-requires:
-- mesos
-- protobuf
-- boost
-- glog
-build_requires:
-- CMake
---- 
-case $ARCHITECTURE in 
-  osx*)
-    [[ -z "$BOOST_ROOT" ]] && BOOST_ROOT=$(brew --prefix boost)
-  ;;
-esac
-cmake "$SOURCEDIR"                               \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT        \
-      -DPROTOBUF_ROOT=${PROTOBUF_ROOT}           \
-      -DMESOS_ROOT=${MESOS_ROOT}                 \
-      ${BOOST_ROOT:+-DBOOST_ROOT=${BOOST_ROOT}}  \
-      -DGLOG_ROOT=${GLOG_ROOT}
-make ${JOBS:+-j $JOBS}
-make install
-
-#ModuleFile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv MESOS_WORKQUEUE_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path LD_LIBRARY_PATH \$::env(MESOS_WORKQUEUE_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(MESOS_WORKQUEUE_ROOT)/lib")
-prepend-path PATH \$::env(MESOS_WORKQUEUE_ROOT)/bin
-EoF
diff --git a/mesos.sh b/mesos.sh
deleted file mode 100644
index 8027da4..0000000
--- a/mesos.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-package: mesos
-version: v0.28.2
-source: https://git-wip-us.apache.org/repos/asf/mesos.git
-tag: 0.28.2
-build_requires:
-- autotools
-- protobuf
-- glog
-- Python
-prepend_path:
-  PATH: "$MESOS_ROOT/sbin"
-  PYTHONPATH: $MESOS_ROOT/lib/python2.7/site-packages
----
-
-rsync -av --delete --exclude="**/.git" $SOURCEDIR/ .
-./bootstrap
-mkdir build
-cd build
-../configure --prefix="$INSTALLROOT"         \
-             --enable-python                 \
-             --disable-java                  \
-             --with-glog=${GLOG_ROOT}        \
-             --with-protobuf=$PROTOBUF_ROOT
-# We build with fewer jobs to avoid OOM errors in GCC
-make -j 4
-make install
-
-#ModuleFile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv MESOS_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$::env(MESOS_ROOT)/lib/python2.7/site-packages
-prepend-path LD_LIBRARY_PATH \$::env(MESOS_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(MESOS_ROOT)/lib")
-prepend-path PATH \$::env(MESOS_ROOT)/bin
-EoF
diff --git a/messagepack.sh b/messagepack.sh
index 4c87928..8da10ee 100644
--- a/messagepack.sh
+++ b/messagepack.sh
@@ -12,7 +12,7 @@ cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX:PATH="${INSTALLROOT}" \
       -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE                    \
       -DMSGPACK_CXX11=ON                                      \
       -DGTEST_DIR=$GOOGLETEST_ROOT                            \
-      -DGTEST_ROOT=$GOOGLETEST_ROOT                           
+      -DGTEST_ROOT=$GOOGLETEST_ROOT
 
 make ${JOBS+-j $JOBS}
 make test
diff --git a/millepedeii.sh b/millepedeii.sh
deleted file mode 100644
index e2a316f..0000000
--- a/millepedeii.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-package: MillepedeII
-version: V04-03-01
-source: https://github.com/PMunkes/MillepedeII
-tag: V04-03-01
----
-#!/bin/bash
-rsync -a $SOURCEDIR/* .
-
-make  pede 
-./pede -t
-rsync pede $INSTALLROOT/bin/
-
-# Modulefile support
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv MILLEPEDEII_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(MILLEPEDEII_ROOT)/bin
-EoF
diff --git a/monalisa-gsoap-client.sh b/monalisa-gsoap-client.sh
deleted file mode 100644
index b32933e..0000000
--- a/monalisa-gsoap-client.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-package: MonALISA-gSOAP-client
-version: "%(tag_basename)s"
-tag: alice/v2.7.10
-source: https://github.com/alisw/monalisa-gsoap-client.git
-build_requires:
- - autotools
- - gSOAP
- - "GCC-Toolchain:(?!osx)"
----
-#!/bin/bash -e
-rsync -a --exclude='**/.git' --delete --delete-excluded \
-      $SOURCEDIR/ ./
-export CFLAGS="-fPIC -I$GSOAP_ROOT/include -L$GSOAP_ROOT/lib"
-export CXXFLAGS="$CFLAGS"
-export CPPFLAGS="$CFLAGS"
-autoreconf -ivf
-./configure --prefix=$INSTALLROOT
-# Does not build in multicore!
-make
-make install
diff --git a/monitoring.sh b/monitoring.sh
index 81a2026..8445a5b 100644
--- a/monitoring.sh
+++ b/monitoring.sh
@@ -41,7 +41,7 @@ proc ModulesHelp { } {
 set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
 module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
 # Dependencies
-module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ${APMON_CPP_VERSION:+ApMon-CPP/$APMON_CPP_VERSION-$APMON_CPP_REVISION}  ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} protobuf/$PROTOBUF_VERSION-$PROTOBUF_REVISION grpc/$GRPC_VERSION-$GRPC_REVISION Configuration/$CONFIGURATION_VERSION-$CONFIGURATION_REVISION                        
+module load BASE/1.0 ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION} ${APMON_CPP_VERSION:+ApMon-CPP/$APMON_CPP_VERSION-$APMON_CPP_REVISION}  ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} protobuf/$PROTOBUF_VERSION-$PROTOBUF_REVISION grpc/$GRPC_VERSION-$GRPC_REVISION Configuration/$CONFIGURATION_VERSION-$CONFIGURATION_REVISION
 
 # Our environment
 setenv Monitoring_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
diff --git a/motif.sh b/motif.sh
deleted file mode 100644
index 52a9207..0000000
--- a/motif.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-package: motif
-version: "1.0"
-system_requirement_missing: "Please install motif and motif-devel"
-system_requirement: ".*"
-system_requirement_check: |
-  printf "#include <Mrm/MrmAppl.h>\nint main() {}\n" | cc -xc - -o /dev/null
----
diff --git a/o2.sh b/o2.sh
deleted file mode 100644
index 8494f41..0000000
--- a/o2.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-package: O2
-version: dev
-requires:
-  - FairRoot
-  - AliRoot
-  - DDS
-  - Vc
-  - hijing
-source: https://github.com/AliceO2Group/AliceO2
-tag: dev
-prepend_path:
-  ROOT_INCLUDE_PATH: "$O2_ROOT/include"
-incremental_recipe: |
-  make ${JOBS:+-j$JOBS} install
-  mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
-  # install the compilation database so that we can post-check the code
-  cp ${BUILDDIR}/compile_commands.json ${INSTALLROOT}
-
-  DEVEL_SOURCES="`readlink $SOURCEDIR || echo $SOURCEDIR`"
-  # This really means we are in development mode. We need to make sure we
-  # use the real path for sources in this case. We also copy the
-  # compile_commands.json file so that IDEs can make use of it directly, this
-  # is a departure from our "no changes in sourcecode" policy, but for a good reason
-  # and in any case the file is in gitignore.
-  if [ "$DEVEL_SOURCES" != "$SOURCEDIR" ]; then
-    perl -p -i -e "s|$SOURCEDIR|$DEVEL_SOURCES|" compile_commands.json
-    ln -sf $BUILDDIR/compile_commands.json $DEVEL_SOURCES/compile_commands.json
-  fi
-  if [[ $ALIBUILD_O2_TESTS ]]; then
-    export O2_ROOT=$INSTALLROOT
-    CTEST_OUTPUT_ON_FAILURE=1 make test
-  fi
-valid_defaults:
-  - o2
-  - o2-daq
-  - o2-dev-fairroot
----
-#!/bin/sh
-export ROOTSYS=$ROOT_ROOT
-
-# Making sure people do not have SIMPATH set when they build fairroot.
-# Unfortunately SIMPATH seems to be hardcoded in a bunch of places in
-# fairroot, so this really should be cleaned up in FairRoot itself for
-# maximum safety.
-unset SIMPATH
-
-case $ARCHITECTURE in
-  osx*)
-    # If we preferred system tools, we need to make sure we can pick them up.
-    [[ ! $BOOST_ROOT ]] && BOOST_ROOT=`brew --prefix boost`
-    [[ ! $ZEROMQ_ROOT ]] && ZEROMQ_ROOT=`brew --prefix zeromq`
-    [[ ! $GSL_ROOT ]] && GSL_ROOT=`brew --prefix gsl`
-    [[ ! $PROTOBUF_ROOT ]] && PROTOBUF_ROOT=`brew --prefix protobuf`
-    SONAME=dylib
-  ;;
-  *) SONAME=so ;;
-esac
-
-cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT                                              \
-      -DCMAKE_MODULE_PATH="$SOURCEDIR/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules;$FAIRROOT_ROOT/share/fairbase/cmake/modules_old"  \
-      -DFairRoot_DIR=$FAIRROOT_ROOT                               \
-      -DALICEO2_MODULAR_BUILD=ON                                  \
-      -DROOTSYS=$ROOTSYS                                          \
-      ${PYTHIA6_ROOT:+-DPythia6_LIBRARY_DIR=$PYTHIA6_ROOT/lib}    \
-      ${GEANT3_ROOT:+-DGeant3_DIR=$GEANT3_ROOT}                   \
-      ${GEANT4_ROOT:+-DGeant4_DIR=$GEANT4_ROOT}                   \
-      -DFAIRROOTPATH=$FAIRROOT_ROOT                               \
-      ${BOOST_ROOT:+-DBOOST_ROOT=$BOOST_ROOT}                     \
-      ${DDS_ROOT:+-DDDS_PATH=$DDS_ROOT}                           \
-      -DZMQ_DIR=$ZEROMQ_ROOT                                      \
-      -DZMQ_INCLUDE_DIR=$ZEROMQ_ROOT/include                      \
-      -DALIROOT=$ALIROOT_ROOT                                     \
-      -DPROTOBUF_INCLUDE_DIR=$PROTOBUF_ROOT/include               \
-      -DPROTOBUF_PROTOC_EXECUTABLE=$PROTOBUF_ROOT/bin/protoc      \
-      -DPROTOBUF_LIBRARY=$PROTOBUF_ROOT/lib/libprotobuf.$SONAME   \
-      ${GSL_ROOT:+-DGSL_DIR=$GSL_ROOT}                            \
-      ${PYTHIA_ROOT:+-DPYTHIA8_INCLUDE_DIR=$PYTHIA_ROOT/include}  \
-      -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-
-if [[ $GIT_TAG == master ]]; then
-  CONTINUE_ON_ERROR=true
-fi
-make ${CONTINUE_ON_ERROR+-k} ${JOBS+-j $JOBS} install
-
-# install the compilation database so that we can post-check the code
-cp compile_commands.json ${INSTALLROOT}
-
-DEVEL_SOURCES="`readlink $SOURCEDIR || echo $SOURCEDIR`"
-# This really means we are in development mode. We need to make sure we
-# use the real path for sources in this case. We also copy the
-# compile_commands.json file so that IDEs can make use of it directly, this
-# is a departure from our "no changes in sourcecode" policy, but for a good reason
-# and in any case the file is in gitignore.
-if [ "$DEVEL_SOURCES" != "$SOURCEDIR" ]; then
-  perl -p -i -e "s|$SOURCEDIR|$DEVEL_SOURCES|" compile_commands.json
-  ln -sf $BUILDDIR/compile_commands.json $DEVEL_SOURCES/compile_commands.json
-fi
-
-# Modulefile
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 FairRoot/$FAIRROOT_VERSION-$FAIRROOT_REVISION ${DDS_ROOT:+DDS/$DDS_VERSION-$DDS_REVISION} ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION} ${VC_VERSION:+Vc/$VC_VERSION-$VC_REVISION}
-# Our environment
-setenv O2_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-setenv VMCWORKDIR \$::env(O2_ROOT)/share
-prepend-path PATH \$::env(O2_ROOT)/bin
-prepend-path MANPATH \$::env(O2_ROOT)/share/man
-prepend-path LD_LIBRARY_PATH \$::env(O2_ROOT)/lib
-prepend-path ROOT_INCLUDE_PATH \$::env(O2_ROOT)/include
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(O2_ROOT)/lib")
-EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
-
-if [[ $ALIBUILD_O2_TESTS ]]; then
-  export O2_ROOT=$INSTALLROOT
-  CTEST_OUTPUT_ON_FAILURE=1 make test
-fi
diff --git a/o2checkcode.sh b/o2checkcode.sh
deleted file mode 100644
index 9071c21..0000000
--- a/o2checkcode.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-package: o2checkcode
-requires:
-  - O2
-  - o2codechecker
-build_requires:
-  - CMake
-force_rebuild: 1
-version: "1.0"
----
-#!/bin/bash -e
-
-# Runs a set of (selected) code checks on the O2 code-base. Assumes the
-# compile_commands.json file is available under $O2_ROOT
-cp "${O2_ROOT}"/compile_commands.json .
-
-# We will try to setup a list of files to be checked by using 2 specific Git commits to compare
-
-# Heuristically guess source directory
-O2_SRC=$(python -c 'import json,sys,os; sys.stdout.write( os.path.commonprefix([ x["file"] for x in json.loads(open("compile_commands.json").read()) if not "G__" in x["file"] and x["file"].endswith(".cxx") ]) )')
-[[ -e "$O2_SRC"/CMakeLists.txt && -d "$O2_SRC"/.git ]]
-
-# We have something to compare our working directory to (ALIBUILD_BASE_HASH). We check only the
-# changed files (including the untracked ones) if the list of relevant files that changed is up to
-# 50 entries long
-if [[ $ALIBUILD_BASE_HASH ]]; then
-  pushd "$O2_SRC"
-    ( git diff --name-only $ALIBUILD_BASE_HASH${ALIBUILD_HEAD_HASH:+...$ALIBUILD_HEAD_HASH} ; git ls-files --others --exclude-standard ) | grep -E '\.cxx$|\.h$' | sort -u > $BUILDDIR/changed
-    if [[ $(cat $BUILDDIR/changed | wc -l) -le 50 ]]; then
-      O2_CHECKCODE_CHANGEDFILES=$(while read FILE; do [[ -e "$O2_SRC/$FILE" ]] && echo "$FILE" || true; done < <(cat $BUILDDIR/changed) | \
-                                  xargs echo | sed -e 's/ /:/g')
-      if [[ ! $O2_CHECKCODE_CHANGEDFILES ]]; then
-        echo "Nothing changed with respect to base commit: not checking anything"
-        exit 0
-      fi
-    fi
-  popd
-fi
-
-# Call a tool to filter out unwanted sources (ROOT dicts, etc) from the compilations database.
-# Further, also optionally restrict the checks on a specific set of files, which can be passed here via means of the
-# environment variable O2_CHECKCODE_CHANGEDFILES. The environment variable is supposed to hold a colon separated list of files.
-ThinCompilationsDatabase.py -exclude-files '(?:.*G\_\_.*\.cxx|.*\.pb.cc)' ${O2_CHECKCODE_CHANGEDFILES:+-use-files ${O2_CHECKCODE_CHANGEDFILES}}
-cp thinned_compile_commands.json compile_commands.json
-
-# List of enabled C++ checks (make sure they are all green)
-CHECKS="${O2_CHECKER_CHECKS:--*,modernize-*,-modernize-use-default,-modernize-pass-by-value,-modernize-use-auto,-modernize-use-bool-literals,-modernize-use-using,-modernize-loop-convert,-modernize-use-bool-literals,-modernize-make-unique,aliceO2-member-name}"
-
-# Run C++ checks
-run_O2CodeChecker.py -clang-tidy-binary $(which O2codecheck) -header-filter=.*SOURCES.* ${O2_CHECKER_FIX:+-fix} -checks=${CHECKS} 2>&1 | tee error-log.txt
-
-# Turn warnings into errors
-sed -e 's/ warning:/ error:/g' error-log.txt > error-log.txt.0 && mv error-log.txt.0 error-log.txt
-
-# Run copyright notice check
-COPYRIGHT="$(cat <<'EOF'
-// Copyright CERN and copyright holders of ALICE O2. This software is
-// distributed under the terms of the GNU General Public License v3 (GPL
-// Version 3), copied verbatim in the file "COPYING".
-//
-// See https://alice-o2.web.cern.ch/ for full licensing information.
-//
-// In applying this license CERN does not waive the privileges and immunities
-// granted to it by virtue of its status as an Intergovernmental Organization
-// or submit itself to any jurisdiction.
-EOF
-)"
-COPYRIGHT_LINES=$(echo "$COPYRIGHT" | wc -l)
-set +x
-while read FILE; do
-  FILE="$O2_SRC/$FILE"
-  [[ "$(head -n$COPYRIGHT_LINES "$FILE")" == "$COPYRIGHT" ]] || { printf "$FILE:1:1: error: missing or malformed copyright notice\n" >> error-log.txt; }
-done < <([[ $O2_CHECKCODE_CHANGEDFILES ]] && echo "$O2_CHECKCODE_CHANGEDFILES" | sed -e 's/:/\n/g' \
-                                          || (cd "$O2_SRC"; find . -name '*.cxx' -o -name '*.h'))
-
-# Tell user what to do in case of copyright notice error
-if grep -q "malformed copyright notice" error-log.txt; then
-  printf "\nerror: Some files are missing the correct copyright notice on top.\n"
-  printf "error: Make sure all your source files begin with the following exact lines:\nerror:\n"
-  while read LINE; do printf "error: $LINE\n"; done < <(echo "$COPYRIGHT")
-  printf "error:\nerror: List of non-compliant files will follow.\n\n"
-fi
-
-# Filter the actual errors from the log. Break with nonzero if errors are found
-! ( grep " error:" error-log.txt )
diff --git a/o2codechecker.sh b/o2codechecker.sh
deleted file mode 100644
index 08b23f6..0000000
--- a/o2codechecker.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-package: o2codechecker
-version: "%(tag_basename)s%(defaults_upper)s"
-requires:
-  - Clang
-build_requires:
-  - CMake
-source: https://github.com/AliceO2Group/O2CodeChecker.git
-tag: master
-incremental_recipe: |
-  make ${JOBS+-j$JOBS} install
-  mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
----
-#!/bin/bash -e
-cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT     \
-                 -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE    \
-                 -DClang_DIR=$CLANG_ROOT/lib/cmake/clang \
-                 -DLLVM_DIR=$CLANG_ROOT/lib/cmake/llvm
-make ${JOBS+-j$JOBS} install
-ctest
-
-# Modulefile
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${CLANG_VERSION:+Clang/$CLANG_VERSION-$CLANG_REVISION}
-# Our environment
-setenv O2CODECHECKER_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(O2CODECHECKER_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(O2CODECHECKER_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(O2CODECHECKER_ROOT)/lib")
-EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
diff --git a/ocdb-test.sh b/ocdb-test.sh
deleted file mode 100644
index a412db3..0000000
--- a/ocdb-test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-package: OCDB-test
-version: "%(short_hash)s"
-requires:
-  - ROOT
-env:
-  ALICE_ROOT: "$ALIROOT_ROOT"
-source: http://git.cern.ch/pub/AliRoot
-write_repo: https://git.cern.ch/reps/AliRoot
-tag: v5-08-19
----
-#!/bin/sh
-rsync -av $SOURCEDIR/OCDB/ $INSTALLROOT/
diff --git a/opengl.sh b/opengl.sh
index 968b3f2..86bb9b4 100644
--- a/opengl.sh
+++ b/opengl.sh
@@ -13,4 +13,3 @@ system_requirement_check: |
    printf "#include <GL/glu.h>\n" | cc -xc - -c -o /dev/null
   fi
 ---
-
diff --git a/openssl.sh b/openssl.sh
index b1ed82d..ffc29e9 100644
--- a/openssl.sh
+++ b/openssl.sh
@@ -26,10 +26,10 @@ build_requires:
 
 rsync -av --delete --exclude="**/.git" $SOURCEDIR/ .
 case ${PKG_VERSION} in
-  v1.1*) 
+  v1.1*)
     OPTS=""
     OPENSSLDIRPREFIX="" ;;
-  *) 
+  *)
     OPTS="no-krb5"
     OPENSSLDIRPREFIX="etc/ssl"
   ;;
diff --git a/osx-system-openssl.sh b/osx-system-openssl.sh
deleted file mode 100644
index 8bae133..0000000
--- a/osx-system-openssl.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-package: osx-system-openssl
-version: 1.0
-system_requirement_missing: |
-  Please make sure you install openssl using Homebrew (brew install openssl)
-system_requirement: "osx.*"
-system_requirement_check: |
-  echo '#include <openssl/bio.h>' | c++ -x c++ - -I`brew --prefix openssl`/include -c -o /dev/null
----
-
diff --git a/parquet-cpp.sh b/parquet-cpp.sh
deleted file mode 100644
index 5c68318..0000000
--- a/parquet-cpp.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-package: parquet-cpp
-version: release-0.1-rc0
-source: https://github.com/apache/parquet-cpp
-build_requires:
-- protobuf
-- snappy
-- zlib
-- thrift
-build_requires:
-- CMake
-- googletest
----
-
-export THRIFT_HOME=$(brew --prefix thrift)
-cmake $SOURCEDIR                                              \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT                     \
-      ${BOOST_ROOT:+-DBOOST_ROOT=$BOOST_ROOT}                 \
-      ${BOOST_ROOT:+-DBoost_DIR=$BOOST_ROOT}                  \
-      ${BOOST_ROOT:+-DBoost_INCLUDE_DIR=$BOOST_ROOT/include}
-
-make ${JOBS+-j $JOBS}
-make install
-
-#ModuleFile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv MESOS_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$::env(MESOS_ROOT)/lib/python2.7/site-packages
-prepend-path LD_LIBRARY_PATH \$::env(MESOS_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(MESOS_ROOT)/lib")
-prepend-path PATH \$::env(MESOS_ROOT)/bin
-EoF
diff --git a/pda.sh b/pda.sh
deleted file mode 100644
index 03bf258..0000000
--- a/pda.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-package: PDA
-version: "%(tag_basename)s"
-tag: 12.0.0
-source: https://github.com/AliceO2Group/pda.git
-requires:
-  - "GCC-Toolchain:(?!osx)"
-build_requires:
-  - kernel-devel
-  - autotools
-
---- 
-#!/bin/sh
-
-rsync -a --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ ./
-./configure --debug=false --numa=true --modprobe=true --prefix=$INSTALLROOT
-make ${JOBS+-j $JOBS} install
-
-#ModuleFile 
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-
-# Dependencies
-module load BASE/1.0                                                                            \\
-            ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}                       
-
-# Our environment
-setenv PDA_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(BASEDIR)/$PKGNAME/\$version/bin
-prepend-path LD_LIBRARY_PATH \$::env(BASEDIR)/$PKGNAME/\$version/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(BASEDIR)/$PKGNAME/\$version/lib")
-EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
diff --git a/perl-modules.sh b/perl-modules.sh
index bf08ff1..cd51f5e 100644
--- a/perl-modules.sh
+++ b/perl-modules.sh
@@ -109,4 +109,3 @@ for x in $PACKAGES; do
   echo "Getting $x from CPAN"
   cpan -j MyConfig.pm $x
 done
-
diff --git a/pythia6.sh b/pythia6.sh
index 345d261..1c8c5a3 100644
--- a/pythia6.sh
+++ b/pythia6.sh
@@ -40,4 +40,3 @@ prepend-path LD_LIBRARY_PATH \$::env(PYTHIA6_ROOT)/lib
 prepend-path AGILE_GEN_PATH \$::env(PYTHIA6_ROOT)
 $([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(PYTHIA6_ROOT)/lib")
 EoF
-
diff --git a/rapidjson.sh b/rapidjson.sh
index 31f272e..590f3b5 100644
--- a/rapidjson.sh
+++ b/rapidjson.sh
@@ -8,7 +8,7 @@ tag: v1.1.0
 #!/bin/sh
 
 cmake $SOURCEDIR                                              \
-      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT                     
+      -DCMAKE_INSTALL_PREFIX=$INSTALLROOT
 
 make ${JOBS:+-j$JOBS} install
 
diff --git a/rivet-test.sh b/rivet-test.sh
deleted file mode 100644
index 9655cc5..0000000
--- a/rivet-test.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-package: Rivet-test
-version: v1
-force_rebuild: 1
-requires:
-  - ThePEG
-  - Rivet
----
-#!/bin/bash
-cat > DIPSYpp_HepMC.in <<\EOF
-read Tune27.in
-cd /DIPSY
-cp EventHandler LHCEventHandler
-set LHCEventHandler:WFL stdProton
-set LHCEventHandler:WFR stdProton
-set LHCEventHandler:ConsistencyLevel 0
-set LHCEventHandler:XSecFn:CheckOffShell false
-set LHCEventHandler:CascadeHandler NULL
-set LHCEventHandler:HadronizationHandler NULL
-set LHCEventHandler:DecayHandler NULL
-create ThePEG::FixedCMSLuminosity LHCLumi
-set LHCEventHandler:LuminosityFunction LHCLumi
-cp Generator LHCGenerator
-set LHCGenerator:EventHandler LHCEventHandler
-set LHCEventHandler:EffectivePartonMode Colours
-set LHCGenerator:EventHandler:DecayHandler /Defaults/Handlers/StandardDecayHandler
-set LHCGenerator:EventHandler:HadronizationHandler Frag8
-set LHCEventHandler:WFL Proton
-set LHCEventHandler:WFR Proton
-set LHCEventHandler:EventFiller:SoftRemove NoValence
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 7000
-create ThePEG::HepMCFile HepMCFile HepMCAnalysis.so
-set LHCGenerator:AnalysisHandlers 0 HepMCFile
-set HepMCFile:Filename DIPSYpp.hepmc
-set HepMCFile:PrintEvent 10000000000
-set HepMCFile:Format GenEvent
-set HepMCFile:Units GeV_mm
-saverun DIPSYpp LHCGenerator
-EOF
-
-setupThePEG -r $THEPEG_ROOT/lib/ThePEG/ThePEGDefaults.rpo \
-            -I $THEPEG_ROOT/share/Ariadne \
-            DIPSYpp_HepMC.in
-runThePEG DIPSYpp.run -N100 --tics
-
-rivet-mkanalysis ALICE_Test
-rivet-buildplugin RivetALICE_Test.so ALICE_Test.cc
-
-rivet --pwd -a ALICE_2010_S8625980 -a ALICE_Test DIPSYpp.hepmc
-
-rivet-cmphistos Rivet.yoda
diff --git a/rivet.sh b/rivet.sh
deleted file mode 100644
index 49456cd..0000000
--- a/rivet.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-package: Rivet
-version: "%(tag_basename)s%(defaults_upper)s"
-tag: 2.5.1-alice1
-source: https://github.com/alisw/rivet
-requires:
-  - GSL
-  - YODA
-  - fastjet
-  - HepMC
-  - boost
-prepend_path:
-  PYTHONPATH: $RIVET_ROOT/lib64/python2.7/site-packages:$RIVET_ROOT/lib/python2.7/site-packages
----
-#!/bin/bash -e
-case $ARCHITECTURE in
-  osx*)
-    # If we preferred system tools, we need to make sure we can pick them up.
-    [[ ! $GSL_ROOT ]] && GSL_ROOT=`brew --prefix gsl`
-    [[ ! $BOOST_ROOT ]] && BOOST_ROOT=`brew --prefix boost`
-  ;;
-  *)
-    ARCH_LDFLAGS="-Wl,--no-as-needed"
-  ;;
-esac
-
-rsync -a --exclude='**/.git' --delete --delete-excluded $SOURCEDIR/ ./
-
-# MPFR and GMP are compiled statically, however in some cases there might be
-# some "-lgmp" left somewhere and we have to deal with it with the correct path.
-# Boost flags are also necessary
-export LDFLAGS="$ARCH_LDFLAGS -L${MPFR_ROOT}/lib -L${GMP_ROOT}/lib -L${CGAL_ROOT}/lib -lCGAL"
-export LIBRARY_PATH="$LD_LIBRARY_PATH"
-export CXXFLAGS="$CXXFLAGS -I${MPFR_ROOT}/include -I${GMP_ROOT}/include -I${CGAL_ROOT}/include -DCGAL_DO_NOT_USE_MPZF"
-
-if [[ "$BOOST_ROOT" != '' ]]; then
-  export LDFLAGS="$LDFLAGS -L$BOOST_ROOT/lib"
-  export CXXFLAGS="$CXXFLAGS -I$BOOST_ROOT/include"
-fi
-if printf "int main(){}" | c++ $LDFLAGS -lboost_thread -lboost_system -xc++ - -o /dev/null; then
-  export LDFLAGS="$LDFLAGS -lboost_thread -lboost_system"
-else
-  export LDFLAGS="$LDFLAGS -lboost_thread-mt -lboost_system-mt"
-fi
-
-[[ "$CXXFLAGS" != *'-std=c++11'* ]] || CXX11=1
-
-autoreconf -ivf
-./configure                                 \
-  --prefix="$INSTALLROOT"                   \
-  --disable-doxygen                         \
-  --with-yoda="$YODA_ROOT"                  \
-  ${GSL_ROOT:+--with-gsl="$GSL_ROOT"}       \
-  --with-hepmc="$HEPMC_ROOT"                \
-  --with-fastjet="$FASTJET_ROOT"            \
-  ${BOOST_ROOT:+--with-boost="$BOOST_ROOT"} \
-  ${CXX11:+--enable-stdcxx11}
-make -j$JOBS
-make install
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${GSL_VERSION:+GSL/$GSL_VERSION-$GSL_REVISION} YODA/$YODA_VERSION-$YODA_REVISION fastjet/$FASTJET_VERSION-$FASTJET_REVISION HepMC/$HEPMC_VERSION-$HEPMC_REVISION
-# Our environment
-setenv RIVET_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$::env(RIVET_ROOT)/lib/python2.7/site-packages
-prepend-path PYTHONPATH \$::env(RIVET_ROOT)/lib64/python2.7/site-packages
-prepend-path PATH \$::env(RIVET_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(RIVET_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(RIVET_ROOT)/lib")
-EoF
diff --git a/roounfold.sh b/roounfold.sh
deleted file mode 100644
index c329408..0000000
--- a/roounfold.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-package: RooUnfold
-version: "%(tag_basename)s%(defaults_upper)s"
-tag: alice/V02-00-01
-source: https://github.com/alisw/RooUnfold
-requires:
- - ROOT
- - boost
----
-cmake $SOURCEDIR -DCMAKE_INSTALL_PREFIX=$INSTALLROOT
-make ${JOBS:+-j$JOBS} install
-make test
-
-rsync -av $SOURCEDIR/include/ $INSTALLROOT/include/
-# Modulefile
-mkdir -p etc/modulefiles
-cat > etc/modulefiles/$PKGNAME <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ROOT/$ROOT_VERSION-$ROOT_REVISION ${BOOST_VERSION:+boost/$BOOST_VERSION-$BOOST_REVISION}
-# Our environment
-setenv ROOUNFOLD_RELEASE \$version
-setenv ROOUNFOLD_VERSION $PKGVERSION
-setenv ROOUNFOLD_ROOT \$::env(BASEDIR)/$PKGNAME/\$::env(ROOUNFOLD_RELEASE)
-prepend-path PATH \$::env(ROOUNFOLD_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(ROOUNFOLD_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(ROOUNFOLD_ROOT)/lib")
-EoF
-mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
diff --git a/sas.sh b/sas.sh
index 8587acf..275404e 100644
--- a/sas.sh
+++ b/sas.sh
@@ -9,6 +9,6 @@ requires:
 cmake $SOURCEDIR \
   -DCMAKE_INSTALL_PREFIX:PATH="$INSTALLROOT" \
   -DLLVM_DEV_DIR=$CLANG_ROOT
-  
+
 make ${JOBS+-j $JOBS}
 make install
diff --git a/sherpa.sh b/sherpa.sh
deleted file mode 100644
index c482a24..0000000
--- a/sherpa.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-package: SHERPA
-version: "%(tag_basename)s%(defaults_upper)s"
-source: https://github.com/alisw/SHERPA
-tag: "alice/v2.1.1"
-build_requires:
-  - curl
-  - autotools
-  - GCC-Toolchain
-  - HepMC
-  - lhapdf5
----
-#!/bin/bash -e
-
-rsync -a --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ ./
-
-autoreconf -ivf
-
-# SHERPA's configure uses wget which might not be there
-mkdir -p fakewget && [[ -d fakewget ]]
-printf '#!/bin/bash\nexec curl -fO $1' > fakewget/wget && chmod +x fakewget/wget
-
-PATH=$PATH:fakewget ./configure --prefix=$INSTALLROOT        \
-                                --with-sqlite3=install       \
-                                --enable-hepmc2=$HEPMC_ROOT  \
-                                --enable-lhapdf=$LHAPDF5_ROOT
-
-make ${JOBS+-j $JOBS}
-make install
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 ${GCC_TOOLCHAIN_ROOT:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
-# Our environment
-setenv SHERPA_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-setenv SHERPA_INSTALL_PATH \$::env(SHERPA_ROOT)/lib/SHERPA
-prepend-path PATH \$::env(SHERPA_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(SHERPA_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(SHERPA_ROOT)/lib")
-prepend-path LD_LIBRARY_PATH \$::env(SHERPA_ROOT)/lib/SHERPA-MC
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(SHERPA_ROOT)/lib/SHERPA-MC")
-EoF
diff --git a/sip-check.sh b/sip-check.sh
deleted file mode 100644
index 7a30a2c..0000000
--- a/sip-check.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-package: sip-check
-version: 1.0
-system_requirement_missing: |
-  Please make sure you have SIP disabled.
-
-  See:
-
-      http://alisw.github.io/alibuild/troubleshooting.html#fastjet-fails-to-compile-on-my-brand-new-mac
-
-  for more information.
-system_requirement: "(osx.*)"
-system_requirement_check: |
-  (which csrutil && (csrutil status | grep disabled) ) || ! which csrutil
----
-
diff --git a/tauolapp.sh b/tauolapp.sh
index 714cd91..5d7d171 100644
--- a/tauolapp.sh
+++ b/tauolapp.sh
@@ -16,7 +16,7 @@ rsync -a $SOURCEDIR/* .
 
 ./configure --with-hepmc=$HEPMC_ROOT --with-lhapdf=$LHAPDF_ROOT --with-pythia8=$PYTHIA_ROOT --prefix=$INSTALLROOT CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS"
 
-make 
+make
 make install
 
 # Modulefile
diff --git a/template-recipe.sh b/template-recipe.sh
deleted file mode 100644
index 5b35a81..0000000
--- a/template-recipe.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-package: MyGenerator
-version: "v1.0.0"
-source: https://github.com/alisw/MyGenerator
-requires:
- - "GCC-Toolchain:(?!osx)"
-build_requires:
-  - CMake
----
-#!/bin/bash -e
-
-cmake  $SOURCEDIR                           \
-       -DCMAKE_INSTALL_PREFIX=$INSTALLROOT
-
-make ${JOBS+-j $JOBS}
-make install
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0
-# Our environment
-setenv MYGENERATOR_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PATH \$::env(MYGENERATOR_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(MYGENERATOR_ROOT)/lib
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(MYGENERATOR_ROOT)/lib")
-EoF
diff --git a/termcap.sh b/termcap.sh
index fbb19a1..0380a24 100644
--- a/termcap.sh
+++ b/termcap.sh
@@ -5,4 +5,3 @@ system_requirement: ".*"
 system_requirement_check: |
   printf "#include <termcap.h>\n" | gcc -xc++ - -c -o /dev/null
 ---
-
diff --git a/thepeg-test.sh b/thepeg-test.sh
deleted file mode 100644
index fbe0ef6..0000000
--- a/thepeg-test.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-package: ThePEG-test
-version: v1
-force_rebuild: 1
-requires:
-  - ThePEG
----
-#!/bin/bash
-cat > DIPSYpp_HepMC.in <<\EOF
-read Tune27.in
-cd /DIPSY
-cp EventHandler LHCEventHandler
-set LHCEventHandler:WFL stdProton
-set LHCEventHandler:WFR stdProton
-set LHCEventHandler:ConsistencyLevel 0
-set LHCEventHandler:XSecFn:CheckOffShell false
-set LHCEventHandler:CascadeHandler NULL
-set LHCEventHandler:HadronizationHandler NULL
-set LHCEventHandler:DecayHandler NULL
-create ThePEG::FixedCMSLuminosity LHCLumi
-set LHCEventHandler:LuminosityFunction LHCLumi
-cp Generator LHCGenerator
-set LHCGenerator:EventHandler LHCEventHandler
-set LHCEventHandler:EffectivePartonMode Colours
-set LHCGenerator:EventHandler:DecayHandler /Defaults/Handlers/StandardDecayHandler
-set LHCGenerator:EventHandler:HadronizationHandler Frag8
-set LHCEventHandler:WFL Proton
-set LHCEventHandler:WFR Proton
-set LHCEventHandler:EventFiller:SoftRemove NoValence
-set LHCGenerator:EventHandler:LuminosityFunction:Energy 7000
-create ThePEG::HepMCFile HepMCFile HepMCAnalysis.so
-set LHCGenerator:AnalysisHandlers 0 HepMCFile
-set HepMCFile:Filename DIPSYpp.hepmc
-set HepMCFile:PrintEvent 10000000000
-set HepMCFile:Format GenEvent
-set HepMCFile:Units GeV_mm
-saverun DIPSYpp LHCGenerator
-EOF
-
-setupThePEG -r $THEPEG_ROOT/lib/ThePEG/ThePEGDefaults.rpo \
-            -I $THEPEG_ROOT/share/Ariadne \
-            DIPSYpp_HepMC.in
-runThePEG DIPSYpp.run -N100 --tics
diff --git a/thepeg.sh b/thepeg.sh
deleted file mode 100644
index 85494eb..0000000
--- a/thepeg.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-package: ThePEG
-version: "%(tag_basename)s%(defaults_upper)s"
-source: https://github.com/alisw/thepeg
-tag: "v2.0.4-alice1"
-requires:
-  - Rivet
-  - pythia
-  - HepMC
-  - boost
-build_requires:
-  - autotools
-prepend_path:
-  LD_LIBRARY_PATH: "$THEPEG_ROOT/lib/ThePEG"
-  DYLD_LIBRARY_PATH: "$THEPEG_ROOT/lib/ThePEG"
-env:
-  ThePEG_INSTALL_PATH: "$THEPEG_ROOT/lib/ThePEG"
----
-#!/bin/bash -e
-case $ARCHITECTURE in
-  osx*)
-    # If we preferred system tools, we need to make sure we can pick them up.
-    [[ ! $GSL_ROOT ]] && GSL_ROOT=`brew --prefix gsl`
-    [[ ! $BOOST_ROOT ]] && BOOST_ROOT=`brew --prefix boost`
-  ;;
-esac
-
-export LDFLAGS="-Wl,--no-as-needed -L${MPFR_ROOT}/lib -L${GMP_ROOT}/lib -L${CGAL_ROOT}/lib"
-export CXXFLAGS="-I${CGAL_ROOT}/include"
-export LIBRARY_PATH="$LD_LIBRARY_PATH"
-
-if [[ "$BOOST_ROOT" != '' ]]; then
-  export LDFLAGS="$LDFLAGS -L$BOOST_ROOT/lib"
-  export CXXFLAGS="$CXXFLAGS -I$BOOST_ROOT/include"
-fi
-if printf "int main(){}" | c++ $LDFLAGS -lboost_thread -lboost_system -xc++ - -o /dev/null; then
-  export LDFLAGS="$LDFLAGS -lboost_thread -lboost_system"
-else
-  export LDFLAGS="$LDFLAGS -lboost_thread-mt -lboost_system-mt"
-fi
-
-rsync -a --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ ./
-
-# Override perl from AliEn-Runtime
-mkdir -p fakeperl/bin
-ln -nfs /usr/bin/perl fakeperl/bin/perl
-export PATH="$PWD/fakeperl/bin:$PATH"
-
-# special treatment for ThePEG version used for DIPSY
-if [[ "$PKGVERSION" =~ "v2015-08-11" ]]; then
-    sed -i -e 's#@PYTHIA8_DIR@/xmldoc#@PYTHIA8_DIR@/share/Pythia8/xmldoc#' TheP8I/Config/interfaces.pl.in
-    sed -i -e 's#@PYTHIA8_DIR@/xmldoc#@PYTHIA8_DIR@/share/Pythia8/xmldoc#' TheP8I/src/Makefile.am
-    sed -i -e 's#@PYTHIA8_DIR@/xmldoc#@PYTHIA8_DIR@/share/Pythia8/xmldoc#' TheP8I/src/Makefile.in
-fi
-
-autoreconf -ivf
-export LDFLAGS="-L$LHAPDF_ROOT/lib"
-./configure                            \
-  --disable-silent-rules               \
-  --enable-shared                      \
-  --enable-stdcxx11                    \
-  --disable-static                     \
-  --without-javagui                    \
-  --prefix="$INSTALLROOT"              \
-  ${GSL_ROOT:+--with-gsl="$GSL_ROOT"}  \
-  --with-pythia8="$PYTHIA_ROOT"        \
-  --with-hepmc="$HEPMC_ROOT"           \
-  --with-rivet="$RIVET_ROOT"           \
-  --with-lhapdf="$LHAPDF_ROOT"         \
-  --with-fastjet="$FASTJET_ROOT"       \
-  --enable-unitchecks 2>&1 | tee -a thepeg_configure.log
-grep -q 'Cannot build TheP8I without a working Pythia8 installation.' thepeg_configure.log && false
-make C_INCLUDE_PATH="${GSL_ROOT}/include" CPATH="${GSL_ROOT}/include" ${JOBS:+-j $JOBS}
-make install
-
-# Modulefile
-MODULEDIR="$INSTALLROOT/etc/modulefiles"
-MODULEFILE="$MODULEDIR/$PKGNAME"
-mkdir -p "$MODULEDIR"
-cat > "$MODULEFILE" <<EoF
-#%Module1.0
-proc ModulesHelp { } {
-  global version
-  puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-}
-set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
-module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
-# Dependencies
-module load BASE/1.0 pythia/$PYTHIA_VERSION-$PYTHIA_REVISION HepMC/$HEPMC_VERSION-$HEPMC_REVISION Rivet/$RIVET_VERSION-$RIVET_REVISION ${GSL_VERSION:+GSL/$GSL_VERSION-$GSL_REVISION}
-# Our environment
-setenv THEPEG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-setenv ThePEG_INSTALL_PATH \$::env(THEPEG_ROOT)/lib/ThePEG
-prepend-path PATH \$::env(THEPEG_ROOT)/bin
-prepend-path LD_LIBRARY_PATH \$::env(THEPEG_ROOT)/lib/ThePEG
-$([[ ${ARCHITECTURE:0:3} == osx ]] && echo "prepend-path DYLD_LIBRARY_PATH \$::env(THEPEG_ROOT)/lib/ThePEG")
-EoF
diff --git a/xalienfs.sh b/xalienfs.sh
deleted file mode 100644
index c34f275..0000000
--- a/xalienfs.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-package: xalienfs
-version: "%(tag_basename)s"
-tag: v1.0.14r1-alice1
-source: https://github.com/alisw/xalienfs.git
-build_requires:
- - autotools
- - XRootD
- - SWIG
- - UUID
- - libperl
----
-#!/bin/bash -e
-[[ ! $SWIG_ROOT ]] && SWIG_LIB=`swig -swiglib`
-
-rsync -a --delete --exclude='**/.git' --delete-excluded \
-      $SOURCEDIR/ ./
-./bootstrap.sh
-autoreconf -ivf
-case $ARCHITECTURE in
-  osx*)
-    [[ "$OPENSSL_ROOT" != "" ]] || OPENSSL_ROOT=`brew --prefix openssl`
-    EXTRA_PERL_CXXFLAGS="-I$(perl -MConfig -e 'print $Config{archlib}')/CORE"
-  ;;
-esac
-export CXXFLAGS="$CXXFLAGS -I$XROOTD_ROOT/include -I$XROOTD_ROOT/include/xrootd/private \
-                 ${UUID_ROOT:+-I$UUID_ROOT/include -L$UUID_ROOT/lib}                    \
-                 ${OPENSSL_ROOT:+-I$OPENSSL_ROOT/include -L$OPENSSL_ROOT/lib}           \
-                 $EXTRA_PERL_CXXFLAGS"
-./configure --prefix=$INSTALLROOT                \
-            --with-xrootd-location=$XROOTD_ROOT  \
-            --enable-perl-module                 \
-            --with-perl=perl                     \
-            --with-swig-inc="$SWIG_LIB"          \
-            --enable-build-server
-# May not work in multicore
-make
-make install INSTALLSITEARCH=$INSTALLROOT/lib/perl \
-             INSTALLARCHLIB=$INSTALLROOT/lib/perl
diff --git a/xcode.sh b/xcode.sh
deleted file mode 100644
index 3cd124c..0000000
--- a/xcode.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-package: Xcode
-version: "1.0"
-system_requirement_missing: |
-  Please make sure you install Xcode and the command line tools using xcode-select --install
-system_requirement: "(osx.*)"
-system_requirement_check: |
-  xcode-select -p && echo '#include <AvailabilityMacros.h>' | clang++ -x c++ - -c -o /dev/null
----
diff --git a/xdevel.sh b/xdevel.sh
index e99d803..b439097 100644
--- a/xdevel.sh
+++ b/xdevel.sh
@@ -8,4 +8,3 @@ system_requirement: ".*"
 system_requirement_check: |
   printf "#include <X11/Xlib.h>\n#include <X11/xpm.h>\n#include <X11/Xft/Xft.h>\n#include <X11/extensions/Xext.h>\n" | cc -xc - -I/opt/X11/include $(freetype-config --cflags 2> /dev/null ||  pkg-config freetype2 --cflags 2> /dev/null)  -c -o /dev/null
 ---
-
diff --git a/xercesc.sh b/xercesc.sh
index 9646abf..c4b98d0 100644
--- a/xercesc.sh
+++ b/xercesc.sh
@@ -11,7 +11,7 @@ env:
 #!/bin/sh
 cd $SOURCEDIR
 autoreconf -i
-cd - 
+cd -
 echo "command $SOURCEDIR configure --prefix $INSTALLROOT CFLAGS $CFLAGS CXXFLAGS=$CFLAGS"
 $SOURCEDIR/configure --prefix=$INSTALLROOT CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS"
 make ${JOBS+-j $JOBS}
diff --git a/yacc-like.sh b/yacc-like.sh
index 54be0d6..965fd81 100644
--- a/yacc-like.sh
+++ b/yacc-like.sh
@@ -7,5 +7,3 @@ system_requirement: ".*"
 system_requirement_check: |
   which bison && which flex
 ---
-
-
diff --git a/yaml-cpp.sh b/yaml-cpp.sh
index ae880d8..ea9fc42 100644
--- a/yaml-cpp.sh
+++ b/yaml-cpp.sh
@@ -46,4 +46,3 @@ module load BASE/1.0 ${BOOST_REVISION:+boost/$BOOST_VERSION-$BOOST_REVISION}
 set YAMLCPP \$::env(BASEDIR)/$PKGNAME/\$version
 prepend-path LD_LIBRARY_PATH \$YAMLCPP/lib
 EoF
-