diff --git a/cmake/modules/FindFairLogger.cmake b/cmake/modules/FindFairLogger.cmake
deleted file mode 100644
index c17b9c95e42e134fc40be8a5772ce039da04afd8..0000000000000000000000000000000000000000
--- a/cmake/modules/FindFairLogger.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# Find FairLogger installation 
-
-FIND_PATH(FAIRLOGGER_INCLUDE_DIR NAMES Logger.h HINTS
-  ${SIMPATH}/include/fairlogger
-  NO_DEFAULT_PATH
-)
-
-FIND_PATH(FAIRLOGGER_LIBRARY_DIR NAMES libFairLogger.so libFairLogger.dylib HINTS
-   ${SIMPATH}/lib
-  NO_DEFAULT_PATH
-)
-
-if(FAIRLOGGER_INCLUDE_DIR AND FAIRLOGGER_LIBRARY_DIR)
-   set(FAIRLOGGER_FOUND TRUE)
-   MESSAGE(STATUS "FairLogger ... - found at ${FAIRLOGGER_LIBRARY_DIR}")
-else()
-   set(FAIRMQ_FOUND FALSE)
-   MESSAGE(STATUS "FairLogger not found")
-endif ()
-
diff --git a/cmake/modules/FindFairMQ.cmake b/cmake/modules/FindFairMQ.cmake
deleted file mode 100644
index 984a43cb37d25922686e76ae6d77994c41cdc34d..0000000000000000000000000000000000000000
--- a/cmake/modules/FindFairMQ.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
-# Find FairMQ installation 
-
-FIND_PATH(FAIRMQ_INCLUDE_DIR NAMES FairMQDevice.h HINTS
-  ${FAIRROOTPATH}/include/fairmq
-  ${SIMPATH}/include/fairmq
-  NO_DEFAULT_PATH
-)
-
-FIND_PATH(FAIRMQ_LIBRARY_DIR NAMES libFairMQ.so libFairMQ.dylib HINTS
-   ${FAIRROOTPATH}/lib
-   ${SIMPATH}/lib
-  NO_DEFAULT_PATH
-)
-
-# look for exported FairMQ targets and include them
-find_file(_fairroot_fairmq_cmake
-    NAMES FairMQ.cmake
-    HINTS ${FAIRROOTPATH}/include/cmake
-)
-if(_fairroot_fairmq_cmake)
-    include(${_fairroot_fairmq_cmake})
-endif()
-
-if(FAIRMQ_INCLUDE_DIR AND FAIRMQ_LIBRARY_DIR)
-   set(FAIRMQ_FOUND TRUE)
-   MESSAGE(STATUS "FairMQ ... - found at ${FAIRMQ_LIBRARY_DIR}")
-else()
-   set(FAIRMQ_FOUND FALSE)
-   MESSAGE(STATUS "FairMQ not found")
-endif ()
-
diff --git a/cmake/modules/FindGEANT4.cmake b/cmake/modules/FindGEANT4.cmake
deleted file mode 100644
index 5123f418d24d16e5a46218f728366891bfc7f891..0000000000000000000000000000000000000000
--- a/cmake/modules/FindGEANT4.cmake
+++ /dev/null
@@ -1,84 +0,0 @@
- ################################################################################
- #    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
- #                                                                              #
- #              This software is distributed under the terms of the             # 
- #              GNU Lesser General Public Licence (LGPL) version 3,             #  
- #                  copied verbatim in the file "LICENSE"                       #
- ################################################################################
-# - Try to find GEANT4
-# Once done this will define
-#
-#  GEANT4_FOUND - system has GEANT4
-#  GEANT4_INCLUDE_DIR - the GEANT4 include directory
-#  GEANT4_LIBRARIES - The libraries needed to use GEANT4
-#  GEANT4_DEFINITIONS - Compiler switches required for using GEANT4
-#
-
-if (GEANT4_INCLUDE_DIR AND GEANT4_LIBRARY_DIR)
-  SET (GEANT4_INCLUDE_DIR GEANT4_INCLUDE_DIR-NOTFOUND)
-  SET (GEANT4_LIB_DIR GEANT4_LIB_DIR-NOTFOUND)
-  SET (GEANT4_PLISTS_LIB_DIR GEANT4_PLISTS_LIB_DIR-NOTFOUND)
-  SET (GEANT4_DIR GEANT4_DIR-NOTFOUND)
-endif (GEANT4_INCLUDE_DIR AND GEANT4_LIBRARY_DIR)
-
-MESSAGE(STATUS "Looking for GEANT4...")
-
-FIND_PATH(GEANT4_DIR NAMES geant4-config PATHS
-  ${SIMPATH}/transport/geant4/bin
-  ${SIMPATH}/bin
-  ${GEANT4_ROOT}/bin
-  NO_DEFAULT_PATH
-)
-
-If(GEANT4_DIR)
-  Set(PATH ${PATH} ${GEANT4_DIR})
-EndIf(GEANT4_DIR)
-
-
-FIND_PATH(GEANT4_INCLUDE_DIR NAMES G4Event.hh PATHS
-  ${SIMPATH}/transport/geant4/include
-  ${SIMPATH}/transport/geant4/include/geant4
-  ${SIMPATH}/transport/geant4/include/Geant4
-  ${SIMPATH}/include/geant4
-  ${SIMPATH}/include/Geant4
-  ${GEANT4_ROOT}/include/Geant4
-  NO_DEFAULT_PATH
-)
-
-SET(GEANT4_INCLUDE_DIR
-  ${GEANT4_INCLUDE_DIR}
-  ${SIMPATH}/transport/geant4/source/interfaces/common/include 
-  ${SIMPATH}/transport/geant4/physics_lists/hadronic/Packaging/include   
-  ${SIMPATH}/transport/geant4/physics_lists/hadronic/QGSP/include
-)
-
-FIND_PATH(GEANT4_LIB_DIR NAMES libG3toG4.so PATHS
-  ${SIMPATH}/transport/geant4/lib/Linux-g++
-  ${SIMPATH}/transport/geant4/lib/Linux-icc
-  ${SIMPATH}/transport/geant4/lib
-  ${SIMPATH}/lib
-  ${GEANT4_ROOT}/lib  
-  NO_DEFAULT_PATH
-)
-
-IF (GEANT4_LIB_DIR)
-  SET(GEANT4_LIBRARY_DIR ${GEANT4_LIB_DIR})
-ENDIF (GEANT4_LIB_DIR)
-
-if (GEANT4_INCLUDE_DIR AND GEANT4_LIBRARY_DIR)
-   set(GEANT4_FOUND TRUE)
-endif (GEANT4_INCLUDE_DIR AND GEANT4_LIBRARY_DIR)
-
-
-if (GEANT4_FOUND)
-  if (NOT GEANT4_FIND_QUIETLY)
-    MESSAGE(STATUS "Looking for GEANT4... - found ${GEANT4_LIBRARY_DIR}")
-#    message(STATUS "Found ${GEANT4_LIBRARY_DIR}")
-  endif (NOT GEANT4_FIND_QUIETLY)
-  SET(LD_LIBRARY_PATH ${LD_LIBRARY_PATH} ${GEANT4_LIBRARY_DIR})
-else (GEANT4_FOUND)
-  if (GEANT4_FIND_REQUIRED)
-    message(FATAL_ERROR "Looking for GEANT4... - Not found")
-  endif (GEANT4_FIND_REQUIRED)
-endif (GEANT4_FOUND)
-
diff --git a/cmake/modules/FindGEANT4DATA.cmake b/cmake/modules/FindGEANT4DATA.cmake
deleted file mode 100644
index d2e89f86f73b8d2081d30f24a9176f7e4a4379cc..0000000000000000000000000000000000000000
--- a/cmake/modules/FindGEANT4DATA.cmake
+++ /dev/null
@@ -1,187 +0,0 @@
- ################################################################################
- #    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
- #                                                                              #
- #              This software is distributed under the terms of the             # 
- #              GNU Lesser General Public Licence (LGPL) version 3,             #  
- #                  copied verbatim in the file "LICENSE"                       #
- ################################################################################
-# - Try to find GEANT4 data files
-#
-
-
-MESSAGE(STATUS "Looking for GEANT4 DATA files...")
-
-FIND_PATH(GEANT4_DATA NAMES $ENV{G4PIIDATA} G4PII G4PII1.3 PATHS
-  ${SIMPATH}/share/Geant4/data
-  $ENV{G4INSTALL_DATA}
-  ${GEANT4_SHARE_DIR}/$ENV{GEANT4VERSION}/data
-  NO_DEFAULT_PATH
-)
-
-#If(DEFINED ENV{G4LEDATA})
-#  Set(G4LEDATA $ENV{G4LEDATA})
-#Else()
-  FIND_PATH(G4LEDATA NAMES README PATHS
-    $ENV{G4LEDATA}
-    ${GEANT4_DATA}/G4EMLOW
-    NO_DEFAULT_PATH
-  )
-#EndIf()
-
-If (G4LEDATA)
-  Message(STATUS "Found G4EMLOW data")
-Else (G4LEDATA)
-  Message(STATUS "NOT Found G4EMLOW data")
-EndIf (G4LEDATA)
-
-#If(DEFINED ENV{G4LEVELGAMMADATA})
-#  Set(G4LEVELGAMMADATA $ENV{G4LEVELGAMMADATA})
-#Else()
-  FIND_PATH(G4LEVELGAMMADATA  NAMES README-LevelGammaData PATHS
-    $ENV{G4LEVELGAMMADATA}
-    ${GEANT4_DATA}/PhotonEvaporation/
-    NO_DEFAULT_PATH
-  )
-#EndIf()
-
-If (G4LEVELGAMMADATA)
-  Message(STATUS "Found PhotonEvaporation data")
-Else (G4LEVELGAMMADATA)
-  Message(STATUS "NOT Found PhotonEvaporation data")
-EndIf (G4LEVELGAMMADATA)
-
-
-#If(DEFINED ENV{G4NEUTRONHPDATA})
-#  Set(G4NEUTRONHPDATA $ENV{G4NEUTRONHPDATA})
-#Else()
-  FIND_PATH(G4NEUTRONHPDATA NAMES README  PATHS
-    $ENV{G4NEUTRONHPDATA}
-    ${GEANT4_DATA}/G4NDL
-    NO_DEFAULT_PATH
-  )
-#EndIf()
-
-If (G4NEUTRONHPDATA)
-  Message(STATUS "Found G4NDL data")
-  SET(G4NeutronHPCrossSections ${G4NEUTRONHPDATA})
-Else ()
-  Message(STATUS "NOT Found G4NDL data")
-EndIf ()
-
-#If(DEFINED ENV{G4NEUTRONXSDATA})
-#  Set(G4NEUTRONXSDATA $ENV{G4NEUTRONXSDATA})
-#Else()
-  FIND_PATH(G4NEUTRONXSDATA NAMES cap1  PATHS
-    $ENV{G4NEUTRONXSDATA}
-    ${GEANT4_DATA}/G4NEUTRONXS
-    NO_DEFAULT_PATH
-  )
-#EndIf()
-
-If (G4NEUTRONXSDATA)
-  Message(STATUS "Found G4NEUTRONXS data")
-Else (G4NEUTRONXSDATA)
-  Message(STATUS "NOT Found G4NEUTRONXS data")
-EndIf (G4NEUTRONXSDATA)
-
-Message("G4PIIDATA: $ENV{G4PIIDATA}")
-#If(DEFINED ENV{G4PIIDATA})
-#  Set(G4PIIDATA $ENV{G4PIIDATA})
-#Else()
-  FIND_PATH(G4PIIDATA NAMES PIXE_DataLibrary.pdf documentation.pdf PATHS
-    $ENV{G4PIIDATA}
-    ${GEANT4_DATA}/G4PII
-    NO_DEFAULT_PATH
-  )
-#EndIf()
-
-
-If (G4PIIDATA)
-  Message(STATUS "Found G4PII data")
-Else (G4PIIDATA)
-  Message(STATUS "NOT Found G4PII data")
-EndIf (G4PIIDATA)
-
-
-#If(DEFINED ENV{G4RADIOACTIVEDATA})
-#  Set(G4RADIOACTIVEDATA $ENV{G4RADIOACTIVEDATA})
-#Else()
-  FIND_PATH(G4RADIOACTIVEDATA NAMES README_RDM PATHS
-    $ENV{G4RADIOACTIVEDATA}
-    ${GEANT4_DATA}/RadioactiveDecay
-    NO_DEFAULT_PATH
-  )
-#EndIf()
-
-If (G4RADIOACTIVEDATA)
-  Message(STATUS "Found RadioactiveDecay data")
-Else (G4RADIOACTIVEDATA)
-  Message(STATUS "NOT Found RadioactiveDecay data")
-EndIf (G4RADIOACTIVEDATA)
-
-
-#If(DEFINED ENV{G4REALSURFACEDATA})
-#  Set(G4REALSURFACEDATA $ENV{G4REALSURFACEDATA})
-#Else()
-  FIND_PATH(G4REALSURFACEDATA NAMES EtchedTiO.dat Rough_LUT.dat PATHS
-    $ENV{G4REALSURFACEDATA}
-    ${GEANT4_DATA}/RealSurface
-    NO_DEFAULT_PATH
-  )
-#EndIf()
-
-If (G4REALSURFACEDATA)
-  Message(STATUS "Found RealSurface data")
-Else (G4REALSURFACEDATA)
-  Message(STATUS "NOT Found RealSurface data")
-EndIf (G4REALSURFACEDATA)
-
-#If(DEFINED ENV{G4SAIDXSDATA})
-#  Set(G4SAIDXSDATA $ENV{G4SAIDXSDATA})
-#Else()
-  FIND_PATH(G4SAIDXSDATA NAMES README_Eta PATHS
-    $ENV{G4SAIDXSDATA}
-    ${GEANT4_DATA}/G4SAIDDATA
-    NO_DEFAULT_PATH
-  )
-#EndIf()
-
-If (G4SAIDXSDATA)
-  Message(STATUS "Found G4SAID data")
-Else (G4SAIDXSDATA)
-  Message(STATUS "NOT Found G4SAID data")
-EndIf (G4SAIDXSDATA)
-
-#If(DEFINED ENV{G4ENSDFSTATEDATA})
-#  Set(G4ENSDFSTATEDATA $ENV{G4ENSDFSTATEDATA})
-#Else()
-  FIND_PATH(G4ENSDFSTATEDATA NAMES ENSDFSTATE.dat PATHS
-    $ENV{G4ENSDFSTATEDATA}
-    ${GEANT4_DATA}/G4ENSDFSTATE
-    NO_DEFAULT_PATH
-  )
-#EndIf()
-
-If (G4ENSDFSTATEDATA)
-  Message(STATUS "Found G4ENSDFSTATE data")
-Else (G4ENSDFSTATEDATA)
-  Message(STATUS "NOT Found G4ENSDFSTATE data")
-EndIf (G4ENSDFSTATEDATA)
-
-# get the information about installed data files and there location from Geant4
-execute_process(COMMAND ${GEANT4_DIR}/geant4-config --datasets
-                  OUTPUT_VARIABLE Geant4_DATASET_DESCRIPTIONS)
-
-# create a list with each line is one entry in the list
-STRING(REGEX REPLACE "\n" ";" Geant4_DATASET_DESCRIPTIONS "${Geant4_DATASET_DESCRIPTIONS}")
-
-# Loop over the list and extract the needed information and put them in the variables 
-# used inside FairRoot v18.2
-foreach(_g4dataset_tuple ${Geant4_DATASET_DESCRIPTIONS})
-  # Format is NAME ENVVAR PATH
-  string(REPLACE " " ";" _g4dataset_tuple "${_g4dataset_tuple}")
-  list(GET _g4dataset_tuple 0 _g4dataset_name)
-  list(APPEND Geant4_DATASETS ${_g4dataset_name})
-  list(GET _g4dataset_tuple 1 Geant4_DATASET_${_g4dataset_name}_ENVVAR)
-  list(GET _g4dataset_tuple 2 Geant4_DATASET_${_g4dataset_name}_PATH)
-endforeach()
diff --git a/cmake/modules/FindGEANT4VMC.cmake b/cmake/modules/FindGEANT4VMC.cmake
deleted file mode 100644
index 1162b04bb44c7d0f6105808c2a6aa1752eb36580..0000000000000000000000000000000000000000
--- a/cmake/modules/FindGEANT4VMC.cmake
+++ /dev/null
@@ -1,122 +0,0 @@
- ################################################################################
- #    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    #
- #                                                                              #
- #              This software is distributed under the terms of the             # 
- #              GNU Lesser General Public Licence (LGPL) version 3,             #  
- #                  copied verbatim in the file "LICENSE"                       #
- ################################################################################
-# - Try to find GEANT4VMC
-# Once done this will define
-#
-#  GEANT4VMC_FOUND - system has GEANT3
-#  GEANT4VMC_INCLUDE_DIR - the GEANT3 include directory
-#  GEANT4VMC_LIBRARIES - The libraries needed to use GEANT3
-#  GEANT4VMC_DEFINITIONS - Compiler switches required for using GEANT3
-#
-
-if (GEANT4VMC_INCLUDE_DIR AND GEANT4VMC_LIBRARY_DIR)
-  SET (GEANT4VMC_INCLUDE_DIR GEANT4VMC_INCLUDE_DIR-NOTFOUND)
-  SET (GEANT4VMC_LIB_DIR GEANT4VMC_LIB_DIR-NOTFOUND)
-  SET (GEANT4VMC_PLISTS_LIB_DIR GEANT4VMC_PLISTS_LIB_DIR-NOTFOUND)
-endif (GEANT4VMC_INCLUDE_DIR AND GEANT4VMC_LIBRARY_DIR)
-
-MESSAGE(STATUS "Looking for GEANT4VMC...")
-
-FIND_PATH(GEANT4VMC_INCLUDE_DIR NAMES TG4G3Units.h PATHS
-  ${SIMPATH}/transport/geant4_vmc/include/geant4vmc
-  ${SIMPATH}/transport/geant4_vmc/include
-  ${SIMPATH}/include/geant4vmc
-  ${GEANT4_VMC_ROOT}/include/geant4vmc
-   NO_DEFAULT_PATH
-)
-
-#set(GEANT4VMC_INCLUDE_DIR
-#${SIMPATH}/transport/geant4_vmc/source/global/include 
-#${SIMPATH}/transport/geant4_vmc/source/geometry/include 
-#${SIMPATH}/transport/geant4_vmc/source/digits+hits/include 
-#${SIMPATH}/transport/geant4_vmc/source/physics/include 
-#${SIMPATH}/transport/geant4_vmc/source/event/include 
-#${SIMPATH}/transport/geant4_vmc/source/run/include 
-#${SIMPATH}/transport/geant4_vmc/source/interfaces/include 
-#${SIMPATH}/transport/geant4_vmc/source/visualization/include 
-#${SIMPATH}/transport/geant4_vmc/include 
-#${SIMPATH}/transport/geant4_vmc/include/geant4vmc 
-#${SIMPATH}/transport/geant4_vmc/include/g4root 
-#${SIMPATH}/transport/vgm/packages/BaseVGM/include 
-#${SIMPATH}/transport/vgm/packages/ClhepVGM/include 
-#${SIMPATH}/transport/vgm/packages/Geant4GM/include 
-#${SIMPATH}/transport/vgm/packages/RootGM/include 
-#${SIMPATH}/transport/vgm/packages/VGM/include 
-#${SIMPATH}/transport/vgm/packages/XmlVGM/include
-#)
-
-
-FIND_PATH(GEANT4VMC_MACRO_DIR NAMES g4libs.C PATHS
-  ${SIMPATH}/transport/macro
-  ${SIMPATH}/transport/geant4_vmc/examples/macro/
-  ${SIMPATH}/transport/geant4_vmc/examples/macro/
-  ${SIMPATH}/share/geant4_vmc/macro/
-  ${GEANT4_VMC_ROOT}/share/examples/macro/
-  NO_DEFAULT_PATH
-)
-
-FIND_PATH(GEANT4VMC_LIBRARY_DIR NAMES libgeant4vmc.so libgeant4vmc.dylib PATHS
-  ${SIMPATH}/transport/geant4_vmc/lib/tgt_linux
-  ${SIMPATH}/transport/geant4_vmc/lib/tgt_linuxicc
-  ${SIMPATH}/transport/geant4_vmc/lib/tgt_linuxx8664gcc
-  ${SIMPATH}/transport/geant4_vmc/lib
-  ${SIMPATH}/lib
-  ${GEANT4_VMC_ROOT}/lib/
-  NO_DEFAULT_PATH
-)
-
-# check for existence of header file, which is needed in FairRunConfiguration
-# The file is only present in old versions of VMC
-FIND_FILE(GEANT4_MODULAR_PHYSICS_LIST TG4ModularPhysicsList.h PATHS
-  ${GEANT4VMC_INCLUDE_DIR}
-  NO_DEFAULT_PATH
-)
-
-if (GEANT4VMC_INCLUDE_DIR AND GEANT4VMC_LIBRARY_DIR)
-  if (NOT GEANT4VMC_FIND_QUIETLY)
-    MESSAGE(STATUS "Looking for GEANT4VMC... - found  ${GEANT4VMC_LIBRARY_DIR}")
-  endif (NOT GEANT4VMC_FIND_QUIETLY)
-else (GEANT4VMC_INCLUDE_DIR AND GEANT4VMC_LIBRARY_DIR)
-  if (GEANT4VMC_FIND_REQUIRED)
-    message(FATAL_ERROR "Looking for GEANT4VMC... - Not found ")
-  endif (GEANT4VMC_FIND_REQUIRED)
-endif (GEANT4VMC_INCLUDE_DIR AND GEANT4VMC_LIBRARY_DIR)
-
-
-MESSAGE(STATUS "Looking for VGM...")
-
-FIND_PATH(VGM_LIBRARY_DIR NAMES libBaseVGM.so libBaseVGM.dylib PATHS
-  ${SIMPATH}/transport/vgm/lib/Linux-g++
-  ${SIMPATH}/transport/vgm.2.08.04/lib/Linux-g++
-  ${SIMPATH}/transport/vgm/lib/Linux-icc
-  ${SIMPATH}/transport/vgm/lib
-  ${SIMPATH}/lib
-  ${VGM_ROOT}/lib
-  NO_DEFAULT_PATH
-)
-
-if (VGM_LIBRARY_DIR)
-  if (NOT GEANT4VMC_FIND_QUIETLY)
-    MESSAGE(STATUS "Looking for VGM... - found  ${VGM_LIBRARY_DIR}")
-  endif (NOT GEANT4VMC_FIND_QUIETLY)
-else (VGM_LIBRARY_DIR)
-  if (GEANT4VMC_FIND_REQUIRED)
-    message(FATAL_ERROR "Looking for VGM... - Not found ")
-  endif (GEANT4VMC_FIND_REQUIRED)
-endif (VGM_LIBRARY_DIR)
-
-
-if (GEANT4VMC_INCLUDE_DIR AND GEANT4VMC_LIBRARY_DIR AND VGM_LIBRARY_DIR)
-   set(GEANT4VMC_FOUND TRUE)
-endif (GEANT4VMC_INCLUDE_DIR AND GEANT4VMC_LIBRARY_DIR AND VGM_LIBRARY_DIR)
-
-if (GEANT4VMC_FOUND)
-  SET(LD_LIBRARY_PATH ${LD_LIBRARY_PATH} ${GEANT4VMC_LIBRARY_DIR} 
-      ${VGM_LIBRARY_DIR})
-endif (GEANT4VMC_FOUND)
-