diff --git a/CMakeLists.txt b/CMakeLists.txt
index c394b40b38f351ef5504e11f63ba97ce91a17ce6..a96dd23bfe5daac8e5b55cb3490a9c0543c304fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
 # The name of our project is "CBMROOT".  CMakeLists files in this project can
-
 # refer to the root source directory of the project as ${CBMROOT_SOURCE_DIR} or
 # as ${CMAKE_SOURCE_DIR} and to the root binary directory of the project as
 # ${CBMROOT_BINARY_DIR} or ${CMAKE_BINARY_DIR}.
@@ -18,22 +17,10 @@ project(CBMROOT)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-FIND_PATH(FAIRBASE NAMES FairRun.h  PATHS
-  ${CBMBASE_DIR}/steer
-  NO_DEFAULT_PATH
-)
-
-If (FAIRBASE)
-  Message(STATUS "Found FAIRBASE")
-  SET(FAIRBASE ${FAIRBASE})
-Else (FAIRBASE)
-  Message(STATUS "NOT Found FAIRBASE")
-  IF(NOT DEFINED ENV{FAIRROOTPATH})
-     MESSAGE(FATAL_ERROR "You did not define the environment variable FAIRROOTPATH which is needed to find FairRoot. Please set this variable and execute cmake again.")
-  ENDIF(NOT DEFINED ENV{FAIRROOTPATH})
-  SET(FAIRROOTPATH $ENV{FAIRROOTPATH})
-
-EndIf (FAIRBASE)
+IF(NOT DEFINED ENV{FAIRROOTPATH})
+  MESSAGE(FATAL_ERROR "You did not define the environment variable FAIRROOTPATH which is needed to find FairRoot. Please set this variable and execute cmake again.")
+ENDIF(NOT DEFINED ENV{FAIRROOTPATH})
+SET(FAIRROOTPATH $ENV{FAIRROOTPATH})
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
 # is checked
@@ -45,20 +32,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 set(CMAKE_PREFIX_PATH $ENV{SIMPATH} ${CMAKE_PREFIX_PATH})
 set(CMAKE_INSTALL_LIBDIR lib)
 
-if(FAIRROOTPATH)
-  find_package(FairRoot)
-  SET(MY_ROOT_INCLUDE_PATH ${FAIRROOT_INCLUDE_DIR})
-  If(CMAKE_INSTALL_PREFIX)
-     Message("***** HERE *****")
-     SET(MY_ROOT_INCLUDE_PATH 
-         ${MY_ROOT_INCLUDE_PATH} 
-         "${CMAKE_INSTALL_PREFIX}/include" 
-         "${CMAKE_INSTALL_PREFIX}/include/mvd"
-         "${CMAKE_INSTALL_PREFIX}/include/littrack"
-         "${CMAKE_INSTALL_PREFIX}/include/KF"
-        )
-  EndIf(CMAKE_INSTALL_PREFIX)
-endif(FAIRROOTPATH)
+find_package(FairRoot)
 
 # Load some basic macros which are needed later on
 include(CbmMacros)
@@ -183,17 +157,6 @@ Set(INCLUDE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/include")
 
 Set(VMCWORKDIR ${CBMROOT_SOURCE_DIR})
 
-Option(USE_PATH_INFO "Information from PATH and LD_LIBRARY_PATH are used." OFF)
-If(USE_PATH_INFO)
-  Set(PATH $ENV{PATH})
-  If (APPLE)
-    Set(LD_LIBRARY_PATH $ENV{DYLD_LIBRARY_PATH})
-  Else (APPLE)
-    Set(LD_LIBRARY_PATH $ENV{LD_LIBRARY_PATH})
-  EndIf (APPLE)
-Else(USE_PATH_INFO)
-  STRING(REGEX MATCHALL "[^:]+" PATH $ENV{PATH})
-EndIf(USE_PATH_INFO)
 
 # Check if the user wants to build the project in the source
 # directory
@@ -207,92 +170,75 @@ ENDIF(NOT UNIX)
 
 #Check if necessary environment variables are set
 #If not stop execution
-if(NOT CBMROOT_MINIMAL)
-  IF(NOT DEFINED ENV{SIMPATH})
-    MESSAGE(FATAL_ERROR "You did not define the environment variable SIMPATH which is nedded to find the external packages. Please set this variable and execute cmake again.")
-  ENDIF(NOT DEFINED ENV{SIMPATH})
-  SET(SIMPATH $ENV{SIMPATH})
-else(NOT CBMROOT_MINIMAL)
-  if(NOT DEFINED ENV{ROOTSYS})
-    MESSAGE(FATAL_ERROR "You did not define the environment variable ROOTSYS which is nedded for the installation of the minimal version of CbmRoot. Please set this variable and execute cmake again.")
-  endif(NOT DEFINED ENV{ROOTSYS})
-endif(NOT CBMROOT_MINIMAL)
-
-
-# Check if the external packages are installed into a separate install
-# directory
-CHECK_EXTERNAL_PACKAGE_INSTALL_DIR()
+IF(NOT DEFINED ENV{SIMPATH})
+  MESSAGE(FATAL_ERROR "You did not define the environment variable SIMPATH which is nedded to find the external packages. Please set this variable and execute cmake again.")
+ENDIF(NOT DEFINED ENV{SIMPATH})
+SET(SIMPATH $ENV{SIMPATH})
 
 # searches for needed packages
 # REQUIRED means that cmake will stop if this packages are not found
 # For example the framework can run without GEANT4, but ROOT is
 # mandatory
-if(CBMROOT_MINIMAL)
-  MESSAGE("******* Install minimal CbmRoot Version ********")
-  find_package(ROOT 6.00.00 REQUIRED)
-else(CBMROOT_MINIMAL)
-  find_package(ROOT 6.00.00 REQUIRED)
-  if("${ROOT_VERSION_MAJOR}.${ROOT_VERSION_MINOR}" VERSION_GREATER 6.16)
-    if("${ROOT_VERSION_MAJOR}.${ROOT_VERSION_MINOR}" VERSION_LESS 6.26)
-      Execute_Process(COMMAND ${ROOT_CONFIG_EXECUTABLE} --has-vmc
-                       OUTPUT_VARIABLE ROOT_vmc_FOUND
-                      )
-
-      String(STRIP ${ROOT_vmc_FOUND} ROOT_vmc_FOUND)
-      If(NOT ROOT_vmc_FOUND)
-        set(CMAKE_PREFIX_PATH $ENV{SIMPATH} ${CMAKE_PREFIX_PATH})
-        find_package2(PUBLIC VMC REQUIRED)
-        set(VMCLIB VMCLibrary)
-      endif()
-    else()
+find_package(ROOT 6.00.00 REQUIRED)
+if("${ROOT_VERSION_MAJOR}.${ROOT_VERSION_MINOR}" VERSION_GREATER 6.16)
+  if("${ROOT_VERSION_MAJOR}.${ROOT_VERSION_MINOR}" VERSION_LESS 6.26)
+    Execute_Process(COMMAND ${ROOT_CONFIG_EXECUTABLE} --has-vmc
+                    OUTPUT_VARIABLE ROOT_vmc_FOUND
+                   )
+
+    String(STRIP ${ROOT_vmc_FOUND} ROOT_vmc_FOUND)
+    If(NOT ROOT_vmc_FOUND)
       set(CMAKE_PREFIX_PATH $ENV{SIMPATH} ${CMAKE_PREFIX_PATH})
       find_package2(PUBLIC VMC REQUIRED)
       set(VMCLIB VMCLibrary)
     endif()
+  else()
+    set(CMAKE_PREFIX_PATH $ENV{SIMPATH} ${CMAKE_PREFIX_PATH})
+    find_package2(PUBLIC VMC REQUIRED)
+    set(VMCLIB VMCLibrary)
   endif()
+endif()
 
-  find_package2(PUBLIC Geant3 REQUIRED)
-  if(Geant3_FOUND)
-    Message("Geant3 was found")
-    Set(Geant3_LIBRARY_DIR ${Geant3_DIR}/../../${Geant3_CMAKE_INSTALL_LIBDIR})
-    FIND_PATH(Geant3_SYSTEM_DIR NAMES data PATHS
-              ${Geant3_DIR}/../../share/geant3
-              ${Geant3_DIR}/../../share/Geant3-${Geant3_VERSION}
-              NO_DEFAULT_PATH)
-  endif()
+find_package2(PUBLIC Geant3 REQUIRED)
+if(Geant3_FOUND)
+  Message("Geant3 was found")
+  Set(Geant3_LIBRARY_DIR ${Geant3_DIR}/../../${Geant3_CMAKE_INSTALL_LIBDIR})
+  FIND_PATH(Geant3_SYSTEM_DIR NAMES data PATHS
+            ${Geant3_DIR}/../../share/geant3
+            ${Geant3_DIR}/../../share/Geant3-${Geant3_VERSION}
+            NO_DEFAULT_PATH)
+endif()
 
-  find_package(GEANT4)
-  find_package(GEANT4DATA)
-  find_package(GEANT4VMC)
-  find_package(TBB)
-  find_package(SSE)
+find_package(GEANT4)
+find_package(GEANT4DATA)
+find_package(GEANT4VMC)
+find_package(TBB)
+find_package(SSE)
 #  find_package(IWYU)
-  find_package(ZeroMQ)
-
-  Set(Boost_NO_SYSTEM_PATHS TRUE)
-  Set(Boost_NO_BOOST_CMAKE TRUE)
-  set(BOOST_ROOT ${SIMPATH})
-  Message("-- Looking for Boost ...")
-  # If an older version of boost is found both of the variables below are
-  # cached and in a second cmake run, a good boost version is found even
-  # if the version is to old.
-  # To overcome this problem both variables are cleared before checking
-  # for boost.
-  Unset(Boost_INCLUDE_DIR CACHE)
-  Unset(Boost_LIBRARY_DIRS CACHE)
-  find_package(Boost 1.48 COMPONENTS program_options thread system timer serialization regex log log_setup filesystem)
-  If (Boost_FOUND)
-    Set(Boost_Avail 1)
-  Else (Boost_FOUND)
-    Set(Boost_Avail 0)
-  EndIf (Boost_FOUND)
-
-  Find_Package(FairLogger)
-  Find_Package(FairMQ)
-
-  find_package(OpenMP)
-
-endif(CBMROOT_MINIMAL)
+find_package(ZeroMQ)
+
+Set(Boost_NO_SYSTEM_PATHS TRUE)
+Set(Boost_NO_BOOST_CMAKE TRUE)
+set(BOOST_ROOT ${SIMPATH})
+Message("-- Looking for Boost ...")
+# If an older version of boost is found both of the variables below are
+# cached and in a second cmake run, a good boost version is found even
+# if the version is to old.
+# To overcome this problem both variables are cleared before checking
+# for boost.
+Unset(Boost_INCLUDE_DIR CACHE)
+Unset(Boost_LIBRARY_DIRS CACHE)
+find_package(Boost 1.48 COMPONENTS program_options thread system timer serialization regex log log_setup filesystem)
+If (Boost_FOUND)
+  Set(Boost_Avail 1)
+Else (Boost_FOUND)
+  Set(Boost_Avail 0)
+EndIf (Boost_FOUND)
+
+Find_Package(FairLogger)
+Find_Package(FairMQ)
+
+find_package(OpenMP)
 
 # set a variable which should be used in all CMakeLists.txt
 # Defines all basic include directories from fairbase
@@ -335,11 +281,6 @@ SET(LD_LIBRARY_PATH  ${CBMLIBDIR} ${Boost_LIBRARY_DIRS} ${LD_LIBRARY_PATH})
 # cause another cmake executable to run.  The same process will walk through
 # the project's entire directory structure.
 
-If(CMAKE_SYSTEM_NAME MATCHES Darwin)
-  Include(CheckIncludeFile)
-  Check_Include_File("_types/_uint8_t.h" _UINT8_T_EXIST)
-EndIf()
-
 Option(BUILD_UNITTESTS "Build all unit tests and add them as new tests" ON)
 If(BUILD_UNITTESTS)
   Message("Build the unit tests.")
@@ -465,29 +406,22 @@ if(IWYU_FOUND)
 
 endif(IWYU_FOUND)
 
-if(NOT CBMROOT_MINIMAL)
-  WRITE_CONFIG_FILE(config.sh)
-  WRITE_CONFIG_FILE(config.csh)
-
-  SET(ROOT_INCLUDE_PATH 
-      ${ROOT_INCLUDE_PATH} 
-      "${CMAKE_INSTALL_PREFIX}/include" 
-      "${CMAKE_INSTALL_PREFIX}/include/mvd"
-      "${CMAKE_INSTALL_PREFIX}/include/littrack"
-      "${CMAKE_INSTALL_PREFIX}/include/KF"
-      "${CMAKE_INSTALL_PREFIX}/include/AnalysisTree"
-      "${CMAKE_INSTALL_PREFIX}/include/AnalysisTreeQA"
-     )
-  set(CMAKE_INSTALL_LIBDIR lib)
-  SET(VMCWORKDIR ${CMAKE_INSTALL_PREFIX}/share/cbmroot)
-  WRITE_CONFIG_FILE(config.sh_install)
-  WRITE_CONFIG_FILE(config.csh_install)
-
-else(NOT CBMROOT_MINIMAL)
-  SET(FULL_CONFIG_FILE "false")
-  WRITE_CONFIG_FILE(config.sh)
-endif(NOT CBMROOT_MINIMAL)
-
+WRITE_CONFIG_FILE(config.sh)
+WRITE_CONFIG_FILE(config.csh)
+
+SET(ROOT_INCLUDE_PATH 
+    ${ROOT_INCLUDE_PATH} 
+    "${CMAKE_INSTALL_PREFIX}/include" 
+    "${CMAKE_INSTALL_PREFIX}/include/mvd"
+    "${CMAKE_INSTALL_PREFIX}/include/littrack"
+    "${CMAKE_INSTALL_PREFIX}/include/KF"
+    "${CMAKE_INSTALL_PREFIX}/include/AnalysisTree"
+    "${CMAKE_INSTALL_PREFIX}/include/AnalysisTreeQA"
+   )
+set(CMAKE_INSTALL_LIBDIR lib)
+SET(VMCWORKDIR ${CMAKE_INSTALL_PREFIX}/share/cbmroot)
+WRITE_CONFIG_FILE(config.sh_install)
+WRITE_CONFIG_FILE(config.csh_install)
 
 Install(FILES ${CMAKE_BINARY_DIR}/config.sh_install
         DESTINATION bin
diff --git a/CbmRoot_test.cmake b/CbmRoot_test.cmake
index bc7b2499dd4049f5bc4245cbb2a37e33dbf75e81..ca43cc51fb9a6d08c994c1d567a557ff611b9fcf 100644
--- a/CbmRoot_test.cmake
+++ b/CbmRoot_test.cmake
@@ -1,3 +1,9 @@
+# Check if cmake has the required version
+# Since flesnet requires 3.14.0 we should be consistent while we
+# build it in the CbmRoot context
+cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
+cmake_policy(VERSION 3.14...3.23)
+
 Set(CTEST_SOURCE_DIRECTORY $ENV{SOURCEDIR})
 Set(CTEST_BINARY_DIRECTORY $ENV{BUILDDIR})
 Set(CTEST_SITE $ENV{SITE})
@@ -21,9 +27,10 @@ Set(CTEST_BUILD_COMMAND "${BUILD_COMMAND} -i -k -j$ENV{number_of_processors}")
 # Extract the FairRoot version from fairroot-config
 # The version info is of the form Major.Minor.Patch e.g. 15.11.1 and
 # is stored in the variable FairRoot_VERSION
-Set(CMAKE_MODULE_PATH "${CTEST_SOURCE_DIRECTORY}/cmake/modules" ${CMAKE_MODULE_PATH})
-Include(CbmMacros)
-FairRootVersion()
+#Set(CMAKE_MODULE_PATH "${CTEST_SOURCE_DIRECTORY}/cmake/modules" ${CMAKE_MODULE_PATH})
+#set(FAIRROOTPATH $ENV{FAIRROOTPATH})
+#Include(CbmMacros)
+#FairRootVersion()
 
 Set(CTEST_USE_LAUNCHERS 1)
 
@@ -81,27 +88,20 @@ If(NOT _RETVAL)
              )
 
   If(${_CMakeModel} MATCHES Continuous)
-    If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
-      CTest_Submit(PARTS Update Configure Build)
-    Else()
-      CTest_Submit(PARTS Update Configure Build
-                   BUILD_ID cdash_build_id
-                  )
-    EndIf()
+    CTest_Submit(PARTS Update Configure Build
+                 BUILD_ID cdash_build_id
+                )
     if(${_NUM_ERROR} GREATER 0)
-      If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
-      Else()
-        message(STATUS " ")
-        message(STATUS " You can find the produced results on the CDash server")
-        message(STATUS " ")
-        message(STATUS " CDash Build Summary ..: "
-                "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/buildSummary.php?buildid=${cdash_build_id}"
-               )
-        message(STATUS " CDash Test List ......: "
-                "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/viewTest.php?buildid=${cdash_build_id}"
-               )
-        message(STATUS " ")
-      EndIf()
+      message(STATUS " ")
+      message(STATUS " You can find the produced results on the CDash server")
+      message(STATUS " ")
+      message(STATUS " CDash Build Summary ..: "
+              "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/buildSummary.php?buildid=${cdash_build_id}"
+             )
+      message(STATUS " CDash Test List ......: "
+              "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/viewTest.php?buildid=${cdash_build_id}"
+             )
+      message(STATUS " ")
       Message(STATUS "Build finished with ${_NUM_ERROR} errors")
       message(FATAL_ERROR "Compilation failure")
     endif()
@@ -114,35 +114,23 @@ If(NOT _RETVAL)
             )
 
   If(${_CMakeModel} MATCHES Continuous)
-    If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
-      CTest_Submit(PARTS Test)
-    Else()
-      CTest_Submit(PARTS Test
-                   BUILD_ID cdash_build_id
-                  )
-    EndIf()
+    CTest_Submit(PARTS Test
+                 BUILD_ID cdash_build_id
+                )
   EndIf()
 
   If(GCOV_COMMAND)
     Ctest_Coverage(BUILD "${CTEST_BINARY_DIRECTORY}")
     If(${_CMakeModel} MATCHES Continuous)
-      If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
-        CTest_Submit(PARTS Coverage)
-      Else()
-        CTest_Submit(PARTS Coverage
-                     BUILD_ID cdash_build_id
-                    )
-      EndIf()
+      CTest_Submit(PARTS Coverage
+                   BUILD_ID cdash_build_id
+                  )
     EndIf()
   EndIf()
 
   Ctest_Upload(FILES ${CTEST_NOTES_FILES})
   If(NOT ${_CMakeModel} MATCHES Continuous)
-    If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
-      Ctest_Submit()
-    Else()
-      Ctest_Submit(BUILD_ID cdash_build_id)
-    EndIf()
+    Ctest_Submit(BUILD_ID cdash_build_id)
   EndIf()
 
   If(EXTRA_FLAGS MATCHES "INSTALL_PREFIX" AND EXTRA_FLAGS MATCHES "CBM_TEST_INSTALL" AND NOT _ctest_test_ret_val)
@@ -159,47 +147,40 @@ If(NOT _RETVAL)
                       RESULTS_VARIABLE _install_ret_value
                      )
     endif()
- Else()
-   # if installation isn't tested the return value should be 0
-   set(_install_ret_value false)
- EndIf()
+  Else()
+     # if installation isn't tested the return value should be 0
+     set(_install_ret_value false)
+  EndIf()
+
+  Message("_ctest_test_ret_val: ${_ctest_test_ret_val}")
+  Message("_install_ret_value: ${_install_ret_value}")
 
   # Pipeline should fail also in case of failed tests
   if (_ctest_test_ret_val OR _install_ret_value)
-    If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
-    Else()
-      message(STATUS " ")
-      message(STATUS " You can find the produced results on the CDash server")
-      message(STATUS " ")
-      message(STATUS " CDash Build Summary ..: "
-              "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/buildSummary.php?buildid=${cdash_build_id}"
-             )
-      message(STATUS " CDash Test List ......: "
-              "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/viewTest.php?buildid=${cdash_build_id}"
-             )
-      message(STATUS " ")
-    EndIf()
+    message(STATUS " ")
+    message(STATUS " You can find the produced results on the CDash server")
+    message(STATUS " ")
+    message(STATUS " CDash Build Summary ..: "
+            "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/buildSummary.php?buildid=${cdash_build_id}"
+           )
+    message(STATUS " CDash Test List ......: "
+            "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/viewTest.php?buildid=${cdash_build_id}"
+           )
+    message(STATUS " ")
     Message(FATAL_ERROR "Some tests failed.")
   endif()
 
 Else()
-  If(${CMAKE_VERSION} VERSION_LESS "3.14.0")
-    Ctest_Submit()
-  Else()
-    CTest_Submit(BUILD_ID cdash_build_id)
-  EndIf()
+  CTest_Submit(BUILD_ID cdash_build_id)
 EndIf()
 
-If(${CMAKE_VERSION} VERSION_LESS 3.14.0)
-Else()
-  message(STATUS " ")
-  message(STATUS " You can find the produced results on the CDash server")
-  message(STATUS " ")
-  message(STATUS " CDash Build Summary ..: "
-          "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/buildSummary.php?buildid=${cdash_build_id}"
-         )
-  message(STATUS " CDash Test List ......: "
-          "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/viewTest.php?buildid=${cdash_build_id}"
-         )
-  message(STATUS " ")
-EndIf()
+message(STATUS " ")
+message(STATUS " You can find the produced results on the CDash server")
+message(STATUS " ")
+message(STATUS " CDash Build Summary ..: "
+        "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/buildSummary.php?buildid=${cdash_build_id}"
+       )
+message(STATUS " CDash Test List ......: "
+        "${CTEST_DROP_METHOD}://${CTEST_DROP_SITE}/viewTest.php?buildid=${cdash_build_id}"
+       )
+message(STATUS " ")
diff --git a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
index 8d0f0d241fef901a0e21639ae2e48515bede6e0b..2057253628c81177713802b6e8d1b8edd5ec15f5 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
@@ -128,10 +128,6 @@ If(CMAKE_SYSTEM_NAME MATCHES Darwin)
     ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
     Set(DEFINITIONS DO_TPCCATRACKER_EFF_PERFORMANCE NonhomogeneousField CBM USE_TIMERS)
   EndIf()
-  If(_UINT8_T_EXIST)
-    Add_Definitions(-DHAVE_UINT8_T_HEADER_FILE)
-    Set(DEFINITIONS ${DEFINITIONS} HAVE_UINT8_T_HEADER_FILE)
-  EndIf()
 Else()
   ADD_DEFINITIONS(-DDO_TPCCATRACKER_EFF_PERFORMANCE -DNonhomogeneousField -DCBM -DUSE_TIMERS)
   Set(DEFINITIONS DO_TPCCATRACKER_EFF_PERFORMANCE NonhomogeneousField CBM USE_TIMERS)
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisHistos.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisHistos.h
index b4ed5fc460022667bd665bc797137e35f8bcefd2..149636cb2926e4ee715c36db9f8e47ea703ccccc 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisHistos.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisHistos.h
@@ -15,14 +15,7 @@
 
 #include <iostream>
 
-#ifdef HAVE_UINT8_T_HEADER_FILE
-#include <_types/_uint16_t.h>
-#include <_types/_uint32_t.h>
-#include <_types/_uint64_t.h>
-#include <_types/_uint8_t.h>
-#else
 #include <stdint.h>
-#endif
 
 #include <Rtypes.h>
 #include <TNamed.h>
@@ -82,6 +75,7 @@ private:
   ClassDef(PairAnalysisHn,
            2)  // (temporary) class to hold functions in THnSparse
 };
+
 ClassImp(PairAnalysisHn)
   //// end temporary solution
 
diff --git a/fles/cosy2019/CMakeLists.txt b/fles/cosy2019/CMakeLists.txt
index 9767a6993c42d661d925f5569cc1d53f7e077d54..8b929bdc8b6c1bcf82b8199b9a3b9799743db911 100644
--- a/fles/cosy2019/CMakeLists.txt
+++ b/fles/cosy2019/CMakeLists.txt
@@ -58,11 +58,6 @@ Set(SRCS
    monitor/CbmCosy2019MonitorTaskHodo.cxx
 )
 
-If(_UINT8_T_EXIST)
-  Add_Definitions(-DHAVE_UINT8_T_HEADER_FILE)
-  Set(DEFINITIONS HAVE_UINT8_T_HEADER_FILE)
-EndIf()
-
 Set(LINKDEF CbmBeamtimeCosy2019LinkDef.h )
 Set(LIBRARY_NAME CbmBeamtimeCosy2019)
 Set(DEPENDENCIES
diff --git a/fles/flestools/CMakeLists.txt b/fles/flestools/CMakeLists.txt
index df1866b468ec409b686de49d849437192f2cebb1..a27cc3c92e5cbb8bc105008c09e1c7c0218baf41 100644
--- a/fles/flestools/CMakeLists.txt
+++ b/fles/flestools/CMakeLists.txt
@@ -35,11 +35,6 @@ Set(SRCS
    CbmFlesHistosTools.cxx
 )
 
-If(_UINT8_T_EXIST)
-  Add_Definitions(-DHAVE_UINT8_T_HEADER_FILE)
-  Set(DEFINITIONS HAVE_UINT8_T_HEADER_FILE)
-EndIf()
-
 #Set(LINKDEF CbmFlibMcbm2018LinkDef.h )
 Set(LIBRARY_NAME CbmFlibFlesTools)
 Set(DEPENDENCIES
diff --git a/fles/mcbm2018/CMakeLists.txt b/fles/mcbm2018/CMakeLists.txt
index 5ec2c19dab1e5fe77702ae79168f6a70d0a3745d..cc731c84a39be273089f674dfd18fd83c8128026 100644
--- a/fles/mcbm2018/CMakeLists.txt
+++ b/fles/mcbm2018/CMakeLists.txt
@@ -127,11 +127,6 @@ Set(SRCS
    tasks/CbmMcbmSpillFindTask.cxx
 )
 
-If(_UINT8_T_EXIST)
-  Add_Definitions(-DHAVE_UINT8_T_HEADER_FILE)
-  Set(DEFINITIONS HAVE_UINT8_T_HEADER_FILE)
-EndIf()
-
 Set(LINKDEF CbmFlibMcbm2018LinkDef.h )
 Set(LIBRARY_NAME CbmFlibMcbm2018)
 Set(DEPENDENCIES
diff --git a/fles/star2019/CMakeLists.txt b/fles/star2019/CMakeLists.txt
index 7fb4e69f8115161a12d99aae7751ffad0ad459e2..8c684dad821089eb48d6d73b091dc4a4be212b9b 100644
--- a/fles/star2019/CMakeLists.txt
+++ b/fles/star2019/CMakeLists.txt
@@ -66,11 +66,6 @@ Set(SRCS
    eventbuilder/CbmStar2019EventBuilderEtof.cxx
 )
 
-If(_UINT8_T_EXIST)
-  Add_Definitions(-DHAVE_UINT8_T_HEADER_FILE)
-  Set(DEFINITIONS HAVE_UINT8_T_HEADER_FILE)
-EndIf()
-
 Set(LINKDEF CbmFlibStar2019LinkDef.h )
 Set(LIBRARY_NAME CbmFlibStar2019)
 Set(DEPENDENCIES