diff --git a/Generator/CMakeLists.txt b/Generator/CMakeLists.txt
index d01b06e06f9edf39552728276c1b6f4bf33ef9de..3996ab2be880fcc2a9275b8b826e209552f8b79a 100644
--- a/Generator/CMakeLists.txt
+++ b/Generator/CMakeLists.txt
@@ -21,7 +21,6 @@ include(${Geant4_USE_FILE})
 find_package(ROOT COMPONENTS RIO Tree TreePlayer MathCore Net Graf3d Graf Gpad EG REQUIRED)
 find_package(LCIO)
 find_package(podio)
-find_package(plcio)
 find_package(EDM4HEP)
 find_package(HepMC)
 find_package(CLHEP)
@@ -34,9 +33,6 @@ endif(LCIO_FOUND)
 if(podio_FOUND)
     message("found podio: ${podio_INCLUDE_DIRS} ${podio_LIBRARIES}")
 endif(podio_FOUND)
-if(plcio_FOUND)
-    message("found plcio: ${plcio_INCLUDE_DIRS} ${plcio_LIBRARY_DIR}")
-endif(plcio_FOUND)
 if(HepMC_FOUND)
     message("found HepMC: ${HepMC_INCLUDE_DIRS} ${HepMC_LIBRARY_DIR}")
 endif(HepMC_FOUND)
@@ -48,26 +44,13 @@ INCLUDE_DIRECTORIES(${GenAlgo_incs})
 
 gaudi_add_module(GenAlgo ${GenAlgo_srcs} 
   INCLUDE_DIRS 
-  #   GaudiKernel
     FWCore
-  #   Geant4
-  #   ${LCIO_INCLUDE_DIRS}
-  #   ${podio_INCLUDE_DIRS}
-  #   ${plcio_INCLUDE_DIRS}
-  #   ${ROOT_INCLUDE_DIRS}
-  #   HepMC
   LINK_LIBRARIES 
-  #   GaudiKernel 
-  #   ${LCIO_LIBRARIES}
-  #   ${podio_LIBRARIES}
     ROOT
-  #   ${plcio_LIBRARY_DIR}/libplcio.so
-  #   ${plcio_LIBRARY_DIR}/libplcioDict.so
     FWCore 
     HepMC
     CLHEP
-  #   Geant4
-    EDM4HEP::edm4hep
+    EDM4HEP::edm4hep EDM4HEP::edm4hepDict
   )
 #gaudi_add_test(Reader FRAMEWORK options/read.py)
 
diff --git a/Simulation/DetSimAna/CMakeLists.txt b/Simulation/DetSimAna/CMakeLists.txt
index 4ab78a91cb9f3bb8e6e0511c398dbc0ddb257f56..b43d75eb40e3f587d611d56d77d3072f282424fb 100644
--- a/Simulation/DetSimAna/CMakeLists.txt
+++ b/Simulation/DetSimAna/CMakeLists.txt
@@ -12,16 +12,14 @@ find_package(DD4hep COMPONENTS DDG4 REQUIRED)
 
 # For EDM & I/O
 find_package(podio REQUIRED)
-find_package(plcio REQUIRED)
 find_package(EDM4HEP REQUIRED)
 # find_package(LCIO REQUIRED)
 
 set(DetSimAna_srcs
-    src/ExampleAnaElemTool.cpp
+#    src/ExampleAnaElemTool.cpp
     src/Edm4hepWriterAnaElemTool.cpp
 )
 message("podio_LIBRARIES: ${podio_LIBRARIES}")
-message("plcio_LIBRARIES: ${plcio_LIBRARIES}")
 gaudi_add_module(DetSimAna ${DetSimAna_srcs}
     INCLUDE_DIRS
       # DetSimInterface
@@ -38,7 +36,6 @@ gaudi_add_module(DetSimAna ${DetSimAna_srcs}
       ${DD4hep_COMPONENT_LIBRARIES} 
       GaudiKernel
       # Geant4
-      ${plcio_LIBRARIES} 
-      EDM4HEP::edm4hep
+      EDM4HEP::edm4hep EDM4HEP::edm4hepDict
       # ${podio_LIBRARIES}
 )
diff --git a/Simulation/DetSimCore/CMakeLists.txt b/Simulation/DetSimCore/CMakeLists.txt
index 0de611c003ad41450f40c96d29a6187643805274..bf58dded63633952e51bc3400513d450366c60e6 100644
--- a/Simulation/DetSimCore/CMakeLists.txt
+++ b/Simulation/DetSimCore/CMakeLists.txt
@@ -9,7 +9,6 @@ gaudi_depends_on_subdirs(
 find_package(Geant4 REQUIRED ui_all vis_all)
 include(${Geant4_USE_FILE})
 find_package(podio REQUIRED)
-find_package(plcio REQUIRED) 
 find_package(EDM4HEP REQUIRED)
 find_package(DD4hep COMPONENTS DDG4 REQUIRED)
 
@@ -40,7 +39,6 @@ gaudi_add_module(DetSimCore ${DetSimCore_srcs}
       # Geant4
       # ${Geant4_LIBRARIES}
       DD4hep ${DD4hep_COMPONENT_LIBRARIES} 
-      plcio
-      EDM4HEP::edm4hep
+      EDM4HEP::edm4hep EDM4HEP::edm4hepDict
       # podio
 )