diff --git a/Utilities/KalDet/CMakeLists.txt b/Utilities/KalDet/CMakeLists.txt
index 241b66d2e3811355fd3c4abefa716d14ed0ad2b9..d95a5cc27cffd698cea0cb37100e81e99e086e1b 100644
--- a/Utilities/KalDet/CMakeLists.txt
+++ b/Utilities/KalDet/CMakeLists.txt
@@ -5,7 +5,6 @@
 
 gaudi_subdir(KalDet v0r0)
 
-find_package(CLHEP REQUIRED)
 find_package(LCIO)
 find_package(GEAR)
 find_package(ROOT COMPONENTS MathCore)
@@ -77,5 +76,5 @@ set( KalDetLib_srcs ${LIB_SOURCES} ${COMMON_SOURCES} )
 
 gaudi_add_library(KalDetLib ${KalDetLib_srcs}
 		 PUBLIC_HEADERS kaldet
-                 LINK_LIBRARIES GaudiKernel ROOT CLHEP LCIO $ENV{GEAR}/lib/libgearsurf.so KalTestLib EDM4HEP::edm4hep EDM4HEP::edm4hepDict ${DD4hep_COMPONENT_LIBRARIES}
+                 LINK_LIBRARIES GaudiKernel ROOT CLHEP LCIO ${GEAR_LIBRARIES} KalTestLib EDM4HEP::edm4hep EDM4HEP::edm4hepDict ${DD4hep_COMPONENT_LIBRARIES}
 )
diff --git a/Utilities/KiTrack/CMakeLists.txt b/Utilities/KiTrack/CMakeLists.txt
index 97d9248ae6117142527a7faf646da37ec24a7da4..22d2f25da413adfae3d0013bd3d5136046f79ce5 100644
--- a/Utilities/KiTrack/CMakeLists.txt
+++ b/Utilities/KiTrack/CMakeLists.txt
@@ -1,7 +1,7 @@
 gaudi_subdir(KiTrack v0r0)
 
 find_package(ROOT REQUIRED)
-find_package(CLHEP REQUIRED)
+#find_package(DD4hep REQUIRED)
 find_package(GSL REQUIRED)
 find_package(EDM4HEP REQUIRED)
 find_package(LCIO REQUIRED)