diff --git a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
index c2ce23558e92808c25b620e8920f5acefc50f35f..10461fd4b06b0ab557f11d9eaca183c1fc2ae34e 100644
--- a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
+++ b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
@@ -8,47 +8,37 @@ atlas_subdir( DecisionHandling )
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
                           Event/xAOD/xAODTrigger
-                          #GaudiKernel
+                          GaudiKernel
                           Control/AthContainers
                           Control/AthLinks 
                           PRIVATE
                           Control/AthViews
-                          #Control/StoreGate
+                          Control/StoreGate
                           Control/AthenaBaseComps
-                          #Control/CxxUtils
+                          Control/CxxUtils
                           Trigger/TrigConfiguration/TrigConfHLTData
-                          #Trigger/TrigEvent/TrigSteeringEvent
-                          #Trigger/TrigSteer/L1Decoder
                           AtlasTest/TestTools
                           Control/StoreGate
                           Trigger/TrigEvent/TrigSteeringEvent
                           Trigger/TrigTools/TrigTimeAlgs
                           Trigger/TrigMonitoring/TrigCostMonitorMT )
 
-find_package( ROOT )
-find_package( Boost )
-
 atlas_add_library( DecisionHandlingLib
                    src/*.cxx
                    PUBLIC_HEADERS DecisionHandling
-                   LINK_LIBRARIES xAODTrigger GaudiKernel
-                   PRIVATE_LINK_LIBRARIES AthenaBaseComps CxxUtils TrigConfHLTData TrigSteeringEvent TrigTimeAlgsLib )
+                   LINK_LIBRARIES xAODTrigger GaudiKernel TrigSteeringEvent
+                   PRIVATE_LINK_LIBRARIES AthenaBaseComps CxxUtils TrigConfHLTData TrigTimeAlgsLib )
 
 # Component(s) in the package:
 atlas_add_component( DecisionHandling
                      src/components/*.cxx
-                     INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${Boost_LIBRARIES}
-                     ${ROOT_LIBRARIES} GaudiKernel AthViews  AthenaBaseComps CxxUtils xAODTrigger DecisionHandlingLib
-                     )
-
+                     LINK_LIBRARIES DecisionHandlingLib )
 
+# Unit tests:
 atlas_add_test( TrigCompositeUtils_test
                 SOURCES test/TrigCompositeUtils_test.cxx
-                LINK_LIBRARIES  TestTools xAODTrigger DecisionHandlingLib
-                AthContainers SGtests )
+                LINK_LIBRARIES TestTools xAODTrigger DecisionHandlingLib AthContainers SGtests )
 
 atlas_add_test( Combinators_test
                 SOURCES test/Combinators_test.cxx
-                LINK_LIBRARIES  TestTools xAODTrigger DecisionHandlingLib
-                AthContainers )
+                LINK_LIBRARIES TestTools xAODTrigger DecisionHandlingLib AthContainers )
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h
index dfbb61fcbd841b126100994b91de23ed700095a5..e7d32cc93072cf82264fff5cc70fc485d08d07ec 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/HypoBase.h
@@ -23,10 +23,6 @@ This is a base class for HLT Hypos to reduce boilerplate and enforce the common
   virtual ~HypoBase(); 
   /// initialise this base class and renounce input decision key handles
   virtual StatusCode sysInitialize() override;
-  /// execute to be implemented in derived clas
-  virtual StatusCode execute(const EventContext&) const override = 0;
-  virtual StatusCode finalize() override = 0;
-  virtual StatusCode initialize() override = 0;
 
  protected:
   /// methods for derived classes to access handles of the base class input and output decisions; other read/write handles may be implemented by derived classes
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
index 10d56a39c905e6f62cdd9cf5dd687950d68b8466..a2192e62790335eefbf36b965003ce0c06790e84 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/InputMakerBase.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef DECISIONHANDLING_INPUTMAKERBASE_H
@@ -24,11 +24,7 @@ This is a base class for HLT InputMakers to reduce boilerplate and enforce the c
   virtual ~InputMakerBase(); 
   /// initialise this base class and renounce input decision key handles
   virtual StatusCode sysInitialize() override;
-  /// execute to be implemented in derived clas
-  virtual StatusCode execute(const EventContext&) const override = 0;
-  virtual StatusCode finalize() override = 0;
-  virtual StatusCode initialize() override = 0;
-  
+
  protected:
   /// methods for derived classes to access handles of the base class input and output decisions; other read/write handles may be implemented by derived classes
   const SG::ReadHandleKeyArray<TrigCompositeUtils::DecisionContainer>& decisionInputs() const;