diff --git a/FSL/CMakeLists.txt b/FSL/CMakeLists.txt
index f68a8fafec4e0d508480ddbfe909f5c145808806..a29c004cfcec657409a953b916747913c51448c4 100644
--- a/FSL/CMakeLists.txt
+++ b/FSL/CMakeLists.txt
@@ -21,8 +21,6 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
     # Set up how the project handle some of its dependenices. Either by picking them
     # up from the environment, or building them itself.
     include( SetupJSON )
-    # Set a flag to steer the  of the subpackages
-    set( ${PROJECT_NAME}_INDIVIDUAL_BUILD ON )
     find_package (FullSimLight REQUIRED)
     add_definitions (-DFSLPLUGINROOT="${FullSimLight_DIR}/../../../${CMAKE_INSTALL_DATAROOTDIR}" )
     message  ( STATUS "FSL plugin files sought here: ${FullSimLight_DIR}/../../../${CMAKE_INSTALL_DATAROOTDIR}" )
diff --git a/FullSimLight/CMakeLists.txt b/FullSimLight/CMakeLists.txt
index 32b9cfe489126db7dbe0a8423efc231ae2e1a0dc..c12a32505dd665b251dee4da823800afbf08bbb1 100644
--- a/FullSimLight/CMakeLists.txt
+++ b/FullSimLight/CMakeLists.txt
@@ -151,24 +151,11 @@ if(Pythia_FOUND)
 endif()
 
 
-# Check if we are building FullSimLight individually,
-# or as a part of the main GeoModel.
-# In the first case, we link against the imported targets, which are taken
-# from the base GeoModel packages already installed on the system.
-# This is used when building distribution packages.
-if ( ${PROJECT_NAME}_INDIVIDUAL_BUILD ) # if built individually
-  target_link_libraries( gmclash PUBLIC GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite )
-  target_link_libraries( gmmasscalc PUBLIC GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite )
-  target_link_libraries( fullSimLight PUBLIC GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite )
-  target_link_libraries( gmgeantino PUBLIC GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite )
-  target_link_libraries( gm2gdml PUBLIC GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite )
-else() # if built as a part of GeoModel
-  target_link_libraries( gmclash PUBLIC GeoModelKernel GeoModelRead GeoModelWrite )
-  target_link_libraries( gmmasscalc PUBLIC GeoModelKernel GeoModelRead GeoModelWrite )
-  target_link_libraries( fullSimLight PUBLIC GeoModelKernel GeoModelRead GeoModelWrite )
-  target_link_libraries( gmgeantino PUBLIC GeoModelKernel GeoModelRead GeoModelWrite )
-  target_link_libraries( gm2gdml PUBLIC GeoModelKernel GeoModelRead GeoModelWrite )
-endif()
+target_link_libraries( gmclash PUBLIC GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite )
+target_link_libraries( gmmasscalc PUBLIC GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite )
+target_link_libraries( fullSimLight PUBLIC GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite )
+target_link_libraries( gmgeantino PUBLIC GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite )
+target_link_libraries( gm2gdml PUBLIC GeoModelCore::GeoModelKernel GeoModelIO::GeoModelRead GeoModelIO::GeoModelWrite )
 
 # targets that need 'nlohmann_json'
 target_link_libraries( gmclash PRIVATE nlohmann_json::nlohmann_json )
diff --git a/FullSimLight/Plugins/CMakeLists.txt b/FullSimLight/Plugins/CMakeLists.txt
index 87a40ac556eb9b81b83f2c944563a2de25a13051..3fccb0bd3e167bd82d77bf22b9a1f7a5401eecfe 100644
--- a/FullSimLight/Plugins/CMakeLists.txt
+++ b/FullSimLight/Plugins/CMakeLists.txt
@@ -28,8 +28,6 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
 
     # Find the base GeoModel packages, which must be installed on the target system already
     find_package( GeoModelCore REQUIRED )
-    # Set a flag to steer the build of the subpackages
-    #set( VISUALIZATION_INDIVIDUAL_BUILD ON )
 else()
     # I am called from other project with add_subdirectory().
     message( STATUS "Building ${PROJECT_NAME} as part of the root GeoModel project.")
diff --git a/GeoModelG4/CMakeLists.txt b/GeoModelG4/CMakeLists.txt
index 2b6c15f3f91ca53b826756313abac0b35a5b4f1d..37c37439c52a8f218eb9cc3824cc483ad91995bf 100644
--- a/GeoModelG4/CMakeLists.txt
+++ b/GeoModelG4/CMakeLists.txt
@@ -31,8 +31,6 @@ if( (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) OR GEOMODEL_BUILD_GEOMODELG4_
         find_package( Geant4 REQUIRED )
         include( SetupXercesC )
     endif()
-    # Set a flag to steer the  of the subpackages
-    set( ${PROJECT_NAME}_INDIVIDUAL_BUILD ON )
     # Print Build Info on screen
     include( PrintBuildInfo )
 else()
diff --git a/GeoModelG4/GeoMaterial2G4/CMakeLists.txt b/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
index 99fccefa3b8153ba6fdf782b105f9929d3afd991..6832e1f89636b19efe543ef09879c858073c000b 100644
--- a/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoMaterial2G4/CMakeLists.txt
@@ -18,18 +18,7 @@ include(${Geant4_USE_FILE})
 
 # Set target and properties
 add_library( GeoMaterial2G4 SHARED ${HEADERS} ${SOURCES} )
-
-# Check if we are building FullSimLight individually,
-# or as a part of the main GeoModel.
-# In the first case, we link against the imported targets, which are taken
-# from the base GeoModel packages already installed on the system.
-# This is used when building distribution packages.
-if ( GeoModelG4_INDIVIDUAL_BUILD ) # if built individually
-    target_link_libraries( GeoMaterial2G4 PUBLIC GeoModelCore::GeoModelKernel )
-else()
-    target_link_libraries( GeoMaterial2G4 PUBLIC GeoModelKernel )
-endif()
-target_link_libraries( GeoMaterial2G4 PUBLIC ${Geant4_LIBRARIES} )
+target_link_libraries( GeoMaterial2G4 PUBLIC GeoModelCore::GeoModelKernel ${Geant4_LIBRARIES} )
 
 target_include_directories( GeoMaterial2G4 PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/GeoModelG4/GeoModel2G4/CMakeLists.txt b/GeoModelG4/GeoModel2G4/CMakeLists.txt
index fff813ad45ec158a388aff3d296d968b340b0d99..80a3c65c836ed87e3d7b5a6e709731ce63b2b201 100644
--- a/GeoModelG4/GeoModel2G4/CMakeLists.txt
+++ b/GeoModelG4/GeoModel2G4/CMakeLists.txt
@@ -40,17 +40,7 @@ message("==> NOTE: G4 solid extensions will be searched in: ${PATHEXTENSIONS}. I
 add_library( GeoModel2G4 SHARED ${HEADERS} ${SOURCES} )
 target_link_libraries( GeoModel2G4
   PUBLIC  ${GEANT4_LIBRARIES}
-  PRIVATE GeoMaterial2G4 )
-# Check if we are building FullSimLight individually,
-# or as a part of the main GeoModel.
-# In the first case, we link against the imported targets, which are taken
-# from the base GeoModel packages already installed on the system.^[OB
-# This is used when building distribution packages.
-if ( GeoModelG4_INDIVIDUAL_BUILD ) # if built individually
-    target_link_libraries( GeoModel2G4 PRIVATE GeoModelCore::GeoModelKernel )
-else()
-    target_link_libraries( GeoModel2G4 PRIVATE GeoModelKernel )
-endif()
+  PRIVATE GeoMaterial2G4 GeoModelCore::GeoModelKernel )
 
 target_include_directories( GeoModel2G4 SYSTEM PUBLIC ${GEANT4_INCLUDE_DIRS} )
 target_include_directories( GeoModel2G4 PUBLIC
diff --git a/GeoModelTools/CMakeLists.txt b/GeoModelTools/CMakeLists.txt
index df0994d672bb2ab9e0f7517c1c193f388bd407cb..a7a3f09c3719483b62dfed56320897d12f6177c9 100644
--- a/GeoModelTools/CMakeLists.txt
+++ b/GeoModelTools/CMakeLists.txt
@@ -32,8 +32,6 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
     # Find the base GeoModel packages, which must be installed on the target system already
     find_package( GeoModelCore REQUIRED ${GeoModel_VERSION} )
     find_package( GeoModelIO REQUIRED ${GeoModel_VERSION} ) 
-    # Set a flag to steer the build of the subpackages
-    #set( VISUALIZATION_INDIVIDUAL_BUILD ON )
     # Print Build Info on screen
     include( PrintBuildInfo )
 else()
diff --git a/GeoModelVisualization/CMakeLists.txt b/GeoModelVisualization/CMakeLists.txt
index 647a12c2b91bf072d9c5f0cf9ff80f25bc82f554..583c96311b237276c79ab280cc7cc4695f85b353 100644
--- a/GeoModelVisualization/CMakeLists.txt
+++ b/GeoModelVisualization/CMakeLists.txt
@@ -33,8 +33,6 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
     # Find the base GeoModel packages, which must be installed on the target system already
     find_package( GeoModelCore REQUIRED ${GeoModel_VERSION} )
     find_package( GeoModelIO REQUIRED ${GeoModel_VERSION} )
-    # Set a flag to steer the build of the subpackages
-    set( VISUALIZATION_INDIVIDUAL_BUILD ON )
     # Print Build Info on screen
     include( PrintBuildInfo )
 else()