diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CMakeLists.txt
index b48e3d0b5e06a2f17be814b577df14f754db2179..49c743ff159d6e393d0ff4005027797132c9a4f3 100644
--- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CMakeLists.txt
@@ -20,7 +20,6 @@ endif()
 atlas_depends_on_subdirs(
    PUBLIC
    Control/AthToolSupport/AsgTools
-   DataQuality/GoodRunsLists
    Event/xAOD/xAODMuon
    Event/xAOD/xAODJet
    Event/xAOD/xAODBTagging
@@ -37,6 +36,7 @@ atlas_depends_on_subdirs(
    PhysicsAnalysis/AnalysisCommon/PATCore
    PhysicsAnalysis/AnalysisCommon/PATInterfaces
    PhysicsAnalysis/AnalysisCommon/PileupReweighting
+   PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
    PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection
    PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection
    PhysicsAnalysis/ElectronPhotonID/IsolationCorrections
@@ -74,7 +74,7 @@ atlas_add_library( CPAnalysisExamplesLib
    CPAnalysisExamples/*.h Root/*.cxx ${CPAnalysisExamplesLibCintSource}
    PUBLIC_HEADERS CPAnalysisExamples
    INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-   LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AsgTools GoodRunsListsLib
+   LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AsgTools 
    xAODMuon xAODJet xAODBTagging xAODCore xAODEgamma xAODMissingET
    xAODPrimitives xAODTau xAODTracking xAODTruth xAODEventInfo
    AssociationUtilsLib IsolationSelectionLib PATCoreLib PATInterfaces
diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/ToolExamplesAlg.h b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/ToolExamplesAlg.h
index c1d7753521031221c5112b073835325d1113c691..bae3e808eef482248ea7eb9884cdae2a2616cefc 100644
--- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/ToolExamplesAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/ToolExamplesAlg.h
@@ -8,7 +8,7 @@
 #include "AthAnalysisBaseComps/AthAnalysisAlgorithm.h"
 
 ///General
-#include "GoodRunsLists/IGoodRunsListSelectionTool.h"
+#include "AsgAnalysisInterfaces/IGoodRunsListSelectionTool.h"
 #include "PileupReweighting/PileupReweightingTool.h"
 #include "TrigDecisionTool/TrigDecisionTool.h"
 #include "TriggerMatchingTool/IMatchingTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/cmt/requirements b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/cmt/requirements
index 58efb847f095f132789eae34e7cee02fb7b43f61..85081a210bb778065432ff34b2919ddc420f0d4e 100644
--- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/cmt/requirements
+++ b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/cmt/requirements
@@ -43,11 +43,11 @@ use JetSelectorTools JetSelectorTools-* PhysicsAnalysis/JetMissingEtID
 use xAODBTaggingEfficiency xAODBTaggingEfficiency-* PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration
 
 #General CP Tools
-use GoodRunsLists GoodRunsLists-* DataQuality
 use PileupReweighting PileupReweighting-* PhysicsAnalysis/AnalysisCommon
 use TrigDecisionTool TrigDecisionTool-* Trigger/TrigAnalysis
 use TriggerMatchingTool TriggerMatchingTool-* Trigger/TrigAnalysis
 use AssociationUtils AssociationUtils-* PhysicsAnalysis/AnalysisCommon
+use AsgAnalysisInterfaces AsgAnalysisInterfaces-*   PhysicsAnalysis/Interfaces
 
 #Electrons
 use ElectronPhotonFourMomentumCorrection ElectronPhotonFourMomentumCorrection-* PhysicsAnalysis/ElectronPhotonID
diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/ToolExamplesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/ToolExamplesAlg.cxx
index f058d7bda6ae6fb54dfa24739c6ddf454d7711cc..f04f5000e7dd4a40810c8c0cb8ede465cc990012 100644
--- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/ToolExamplesAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/src/ToolExamplesAlg.cxx
@@ -83,15 +83,15 @@ StatusCode ToolExamplesAlg::execute() {
   const xAOD::JetContainer* jets = 0; CHECK( evtStore()->retrieve( jets, "AntiKt4EMTopoJets" ) );
 
   //GRL Example
-  bool passGRL = m_grl->passRunLB(*ei);
+  //bool passGRL = m_grl->passRunLB(*ei);
   
   //PRW Example
   CHECK( m_prw->apply(*ei) );
-  float pileupWeight = ei->auxdecor<float>("PileupWeight");
-  uint randomRunNumber = ei->auxdecor<uint>("RandomRunNumber");
+  //float pileupWeight = ei->auxdecor<float>("PileupWeight");
+  //uint randomRunNumber = ei->auxdecor<uint>("RandomRunNumber");
 
   //Trigger Decision Example
-  bool passTrigger = m_tdt->isPassed("HLT_e24_lhmedium_L1EM20VH");
+  //bool passTrigger = m_tdt->isPassed("HLT_e24_lhmedium_L1EM20VH");
 
 
   //Electron Calibration, Iso Calibration, LH Selection, Iso Selection, Scale Factor Example