diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt
index 212e83ee62c19d37eab82aeb339952682808bdd5..60e7b75f0dafb1a2d6e147d30c8a99479d4dc85f 100644
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt
+++ b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/CMakeLists.txt
@@ -1,36 +1,11 @@
-################################################################################
-# Package: ExpressionEvaluation
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( ExpressionEvaluation )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Control/SGTools
- Control/StoreGate
- GaudiKernel
- Trigger/TrigAnalysis/TrigDecisionTool
- PRIVATE
- Event/xAOD/xAODBTagging
- Event/xAOD/xAODBase
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODEventShape
- Event/xAOD/xAODJet
- Event/xAOD/xAODMissingET
- Event/xAOD/xAODMuon
- Event/xAOD/xAODPFlow
- Event/xAOD/xAODParticleEvent
- Event/xAOD/xAODTau
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTruth )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
+find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_library( ExpressionEvaluationLib
@@ -39,11 +14,5 @@ atlas_add_library( ExpressionEvaluationLib
PUBLIC_HEADERS ExpressionEvaluation
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers SGTools GaudiKernel StoreGateLib SGtests TrigDecisionToolLib
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers GaudiKernel SGTools StoreGateLib TrigDecisionToolLib
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} xAODBTagging xAODBase xAODCaloEvent xAODEgamma xAODEventInfo xAODEventShape xAODJet xAODMissingET xAODMuon xAODPFlow xAODParticleEvent xAODTau xAODTracking xAODTruth )
-
-atlas_add_component( ExpressionEvaluation
- src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthContainers SGTools StoreGateLib SGtests GaudiKernel TrigDecisionToolLib xAODBTagging xAODBase xAODCaloEvent xAODEgamma xAODEventInfo xAODEventShape xAODJet xAODMissingET xAODMuon xAODPFlow xAODParticleEvent xAODTau xAODTracking xAODTruth ExpressionEvaluationLib )
-
diff --git a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/components/ExpressionEvaluation_entries.cxx b/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/components/ExpressionEvaluation_entries.cxx
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/CommonTools/ExpressionEvaluation/src/components/ExpressionEvaluation_entries.cxx
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Simulation/FastShower/FastCaloSimAthenaPool/src/components/FastCaloSimAthenaPool_entries.cxx b/Simulation/FastShower/FastCaloSimAthenaPool/src/components/FastCaloSimAthenaPool_entries.cxx
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/Simulation/FastShower/FastCaloSimAthenaPool/src/components/FastCaloSimAthenaPool_entries.cxx
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Trigger/TrigEvent/TrigMissingEtEvent/src/components/TrigMissingEtEvent_entries.cxx b/Trigger/TrigEvent/TrigMissingEtEvent/src/components/TrigMissingEtEvent_entries.cxx
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigMissingEtEvent/src/components/TrigMissingEtEvent_entries.cxx
+++ /dev/null
@@ -1 +0,0 @@
-