diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/CMakeLists.txt b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/CMakeLists.txt
index 773ec982b3f06f1297adfcbab9b30151d085d9f7..c07a0f0d43bdafc34d370883b4dcd8b6b2f44c2c 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/CMakeLists.txt
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/CMakeLists.txt
@@ -1,29 +1,8 @@
-# $Id: CMakeLists.txt 780663 2016-10-27 09:43:48Z krasznaa $
-################################################################################
-# Package: JetSelectorTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( JetSelectorTools )
 
-# Extra dependencies based on the build environment:
-set( extra_deps )
-if( XAOD_STANDALONE )
-   set( extra_deps Control/xAODRootAccess )
-else()
-   set( extra_deps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
-   PUBLIC
-   Control/AthToolSupport/AsgTools
-   Event/xAOD/xAODJet
-   PhysicsAnalysis/AnalysisCommon/PATCore
-   Reconstruction/Jet/JetInterface
-   PRIVATE
-   ${extra_deps} )
-
 # External dependencies:
 find_package( ROOT COMPONENTS Core RIO )
 
@@ -32,12 +11,12 @@ atlas_add_library( JetSelectorToolsLib
    JetSelectorTools/*.h Root/*.cxx
    PUBLIC_HEADERS JetSelectorTools
    INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODJet JetInterface PATCoreLib )
+   LINK_LIBRARIES ${ROOT_LIBRARIES} AsgMessagingLib AsgTools xAODEventInfo xAODJet JetInterface PATCoreAcceptLib )
 
 if( NOT XAOD_STANDALONE )
    atlas_add_component( JetSelectorTools
       src/*.h src/*.cxx src/components/*.cxx
-      LINK_LIBRARIES GaudiKernel JetSelectorToolsLib )
+      LINK_LIBRARIES AsgTools AthenaBaseComps GaudiKernel JetSelectorToolsLib xAODBase xAODEventInfo )
 endif()
 
 atlas_add_dictionary( JetSelectorToolsDict
@@ -50,8 +29,7 @@ if( XAOD_STANDALONE )
    atlas_add_executable( TestJetCleaningTool
       util/TestJetCleaningTool.cxx
       INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-      LINK_LIBRARIES ${ROOT_LIBRARIES} xAODRootAccess xAODJet
-      JetSelectorToolsLib )
+      LINK_LIBRARIES ${ROOT_LIBRARIES} xAODJet JetSelectorToolsLib )
 endif()
 
 # Install files from the package:
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/python/ConfiguredJetCleaningTools.py b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/python/ConfiguredJetCleaningTools.py
index 54ebd8fc2c0eb550438964de62bf08c8123aeedc..c6b7eda5fc82cabc0ea104b48bf379e59125bd56 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/python/ConfiguredJetCleaningTools.py
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/python/ConfiguredJetCleaningTools.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 ##=============================================================================
 ## Name:        ConfiguredJetCleaningTools
@@ -16,10 +16,8 @@ from PATCore.HelperUtils import SetToolProperties
 from AthenaCommon import CfgMgr
 
 # Import the needed stuff specific to the JetCleaning
-from JetSelectorTools.JetSelectorToolsConf import JetCleaningTool
 from JetSelectorTools.JetSelectorToolsConf import ECUtils__EventCleaningTool as EventCleaningTool
-from JetSelectorTools.JetCleaningCutDefs import *
-
+from JetSelectorTools.JetCleaningCutDefs import JetCleaningToolConfig_Loose, JetCleaningToolConfig_Tight
 
 
 def recEventCleaningTool(name='EventCleaningTool'):