diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt
index 9716986b9ab24a5a0fe69a5400b82c6567564569..aefaf75e0895d8345e208ce8f2b3f18f8e330dbe 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/CMakeLists.txt
@@ -13,8 +13,6 @@ atlas_depends_on_subdirs( PRIVATE
                           Control/AthViews
                           Control/CxxUtils
                           Control/StoreGate
-                          DetectorDescription/GeoPrimitives
-                          Event/EventInfo
                           Event/FourMomUtils
                           Event/xAOD/xAODEventInfo
                           Event/xAOD/xAODBase
@@ -25,19 +23,11 @@ atlas_depends_on_subdirs( PRIVATE
                           Event/xAOD/xAODTrigger
                           GaudiKernel
                           LumiBlock/LumiBlockComps
-                          PhysicsAnalysis/AnalysisCommon/PATCore
-                          Generators/GeneratorObjects
                           InnerDetector/InDetConditions/BeamSpotConditionsData
-                          InnerDetector/InDetConditions/InDetBeamSpotService
                           InnerDetector/InDetRecTools/InDetConversionFinderTools
                           PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
-                          Reconstruction/Particle
-                          Tracking/TrkEvent/TrkParameters
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/VxVertex
                           Tracking/TrkVertexFitter/TrkVKalVrtFitter
                           Trigger/TrigEvent/TrigBphysicsEvent
-                          Trigger/TrigEvent/TrigCaloEvent
                           Trigger/TrigEvent/TrigInDetEvent
                           Trigger/TrigEvent/TrigMuonEvent
                           Trigger/TrigEvent/TrigNavigation
@@ -46,21 +36,19 @@ atlas_depends_on_subdirs( PRIVATE
                           Trigger/TrigSteer/TrigInterfaces
                           Trigger/TrigT1/TrigT1Interfaces
                           Trigger/TrigTools/TrigInDetToolInterfaces
-                          Trigger/TrigTools/TrigTimeAlgs
                           Trigger/TrigSteer/DecisionHandling
                           Trigger/TrigSteer/TrigCompositeUtils)
 
 # External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
 
 # Component(s) in the package:
 atlas_add_component( TrigBphysHypo
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel AthLinks BeamSpotConditionsData InDetConversionFinderToolsLib DecisionHandlingLib FourMomUtils StoreGateLib SGtests GeoPrimitives EventInfo xAODEventInfo xAODMuon xAODTracking xAODTrigBphys xAODTrigMuon GaudiKernel GeneratorObjects Particle ElectronPhotonSelectorToolsLib TrkParameters TrkTrack VxVertex TrkVKalVrtFitterLib TrigBphysicsEvent TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigNavigationLib TrigParticle TrigSteeringEvent TrigInterfacesLib TrigT1Interfaces TrigTimeAlgsLib AthViews TrigCompositeUtilsLib )
+                     INCLUDE_DIRS 
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel AthLinks BeamSpotConditionsData ElectronPhotonSelectorToolsLib InDetConversionFinderToolsLib DecisionHandlingLib FourMomUtils StoreGateLib xAODEventInfo xAODMuon xAODTracking xAODTrigBphys xAODTrigMuon GaudiKernel TrkVKalVrtFitterLib TrigBphysicsEvent TrigInDetEvent TrigMuonEvent TrigNavigationLib TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib AthViews TrigCompositeUtilsLib TrigT1Interfaces TrigParticle)
+
+#TrigParticle is needed for linking getRecentFeaturesLinks for some reason
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/BtrigUtils.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/BtrigUtils.cxx
index 5fd07ce25298088aed37fb9de434e6d025508e01..71246290460602babd506785a1698dfd4f916f52 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/BtrigUtils.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/BtrigUtils.cxx
@@ -12,7 +12,6 @@
 #include "TrigInDetEvent/TrigInDetTrackFitPar.h"
 
 #include "TrigSteeringEvent/Enums.h"
-#include "TrkParameters/TrackParameters.h"
 
 #include "xAODMuon/Muon.h"
 #include "xAODTracking/TrackParticle.h"
@@ -23,7 +22,7 @@
 //----------------------------------------------
 // pT calculation using Trk::Track.
 //----------------------------------------------
-
+/*
 double PtVal(const std::vector<const Trk::Track*> & tracks) {
 
   std::vector<const Trk::Track*>::const_iterator trkItr    = tracks.begin();
@@ -42,7 +41,7 @@ double PtVal(const std::vector<const Trk::Track*> & tracks) {
   if ( pt2 < 0 ) return 0;
   else          return sqrt(pt2);
 }
-
+*/
 //----------------------------------------------
 // pT calculation using xAOD::TrackParticle.
 //----------------------------------------------
@@ -160,7 +159,7 @@ double InvMass(const std::vector<const TrigInDetTrackFitPar*> & tracks, const st
 //--------------------------------------------------------
 // Invariant mass calculations using Trk::MeasuredPerigee.
 //--------------------------------------------------------
-
+/*
 double InvMass(const std::vector<const Trk::TrackParameters*> & tracks, const std::vector<double> & massHypo) {
 
   std::vector<const Trk::TrackParameters*>::const_iterator trkItr    = tracks.begin();
@@ -176,7 +175,7 @@ double InvMass(const std::vector<const Trk::TrackParameters*> & tracks, const st
 
   return InvMass(px, py, pz, massHypo);
 }
-
+*/
 //--------------------------------------------------------
 // Invariant mass calculations using Trk::Perigee.
 //--------------------------------------------------------
@@ -200,7 +199,7 @@ double InvMass(const std::vector<const Trk::Perigee*> & tracks, const std::vecto
 //----------------------------------------------
 // Invariant mass calculations using Trk::Track.
 //----------------------------------------------
-
+/*
 double InvMass(const std::vector<const Trk::Track*> & tracks, const std::vector<double> & massHypo) {
 
   std::vector<const Trk::Track*>::const_iterator trkItr    = tracks.begin();
@@ -221,7 +220,7 @@ double InvMass(const std::vector<const Trk::Track*> & tracks, const std::vector<
 
   return InvMass(px, py, pz, massHypo);
 }
-
+*/
 double fabsDeltaPhi(double phi1, double phi2) {
     double dPhi=fabs(phi1 - phi2);
     if (dPhi > M_PI) dPhi = 2.*M_PI - dPhi;
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/BtrigUtils.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/BtrigUtils.h
index e22bec9526e6eb65b0acd34b86ec38f76e064216..b6f86ffc01764f14d9e3aa4a1a06c20afa56e8e8 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/BtrigUtils.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/BtrigUtils.h
@@ -7,19 +7,16 @@
 
 #include <vector>
 
-#include "GaudiKernel/MsgStream.h"
-
 #include "TrigInDetEvent/TrigInDetTrack.h"
 #include "TrigInDetEvent/TrigInDetTrackFitPar.h"
 //#include "TrigMuonEvent/TrigMuonEFInfoContainer.h"
 #include "TrigSteeringEvent/Enums.h"
 
-#include "TrkTrack/Track.h"
 
 // xAOD edm
 #include "xAODMuon/MuonContainer.h"
 
-double PtVal(const std::vector<const Trk::Track*>&);
+//double PtVal(const std::vector<const Trk::Track*>&);
 double PtVal(const std::vector<const xAOD::TrackParticle*>&);
 
 double LxyVal(const double, const double, const Amg::Vector3D, const Amg::Vector3D);
@@ -27,7 +24,7 @@ double LxyVal(const double, const double, const Amg::Vector3D, const Amg::Vector
 double InvMass(const std::vector<const TrigInDetTrack*>  &    , const std::vector<double>&);
 double InvMass(const std::vector<const TrigInDetTrackFitPar*>&, const std::vector<double>&);
 double InvMass(const std::vector<const Trk::TrackParameters*>&, const std::vector<double>&);
-double InvMass(const std::vector<const Trk::Track*>          &, const std::vector<double>&);
+//double InvMass(const std::vector<const Trk::Track*>          &, const std::vector<double>&);
 double InvMass(const std::vector<const Trk::Perigee*>        &, const std::vector<double>&);
 
 // JW new methods to help simplify the algorithms
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysElectronCounter.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysElectronCounter.h
index cc9c7868dc852162d32f629fa2dfdd5be9ad5b73..ab36be4fd711da2bd80931db6735d7913587dd2f 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysElectronCounter.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysElectronCounter.h
@@ -20,8 +20,6 @@
 
 // standard stuff
 #include <string>
-#include <map>
-#include <cmath> 
 #include <algorithm>
 
 #include "TrigInterfaces/AllTEAlgo.h"
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysHelperUtilsTool.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysHelperUtilsTool.cxx
index 09dfcd8ba0efa84b25b4e810e754863d55eb2696..8fcabff24e5b5660bae38756b6e5a43b107cb938 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysHelperUtilsTool.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysHelperUtilsTool.cxx
@@ -16,10 +16,6 @@
 
 // FrameWork includes
 
-
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
 #include "xAODTrigMuon/L2StandAloneMuon.h"
 
 
@@ -239,20 +235,10 @@ StatusCode TrigBphysHelperUtilsTool::getRunEvtLb(uint32_t & run, uint32_t & evt,
     evt = ~0;
     lb  = ~0;
     // JW - Try to get the xAOD event info
-    const EventInfo* pEventInfo(0);
     const xAOD::EventInfo *evtInfo(0);
     if ( evtStore()->retrieve(evtInfo).isFailure() ) {
-        ATH_MSG_DEBUG("Failed to get xAOD::EventInfo " );
+        ATH_MSG_WARNING("Failed to get xAOD::EventInfo " );
         // now try the old event ifo
-        if ( evtStore()->retrieve(pEventInfo).isFailure() ) {
-            ATH_MSG_DEBUG("Failed to get EventInfo " );
-            return StatusCode::FAILURE;
-        } else {
-            run   = pEventInfo->event_ID()->run_number();
-            evt   = pEventInfo->event_ID()->event_number();
-            lb    = pEventInfo->event_ID()->lumi_block();
-            ATH_MSG_DEBUG(" Run " << run << " Event " << evt );
-        }// found old event info
     }else { // found the xAOD event info
         run   = evtInfo->runNumber();
         evt   = evtInfo->eventNumber();
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysHelperUtilsTool.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysHelperUtilsTool.h
index c680bd19bd994ab54a5a1204c5864e91b980cecb..3bb9958f82141793952187b4e96335f6b49d2dd4 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysHelperUtilsTool.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigBphysHelperUtilsTool.h
@@ -17,8 +17,6 @@
 
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
 #include "xAODEventInfo/EventInfo.h"
 #include "xAODMuon/Muon.h"
 #include "xAODTrigBphys/TrigBphys.h"
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBEEXFex.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBEEXFex.cxx
index 2d433ffa5a56fd40d8e03cde8f759138c22d1077..cd07c6b8f41a2ad1b7afe587a085a71114a47ee7 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBEEXFex.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBEEXFex.cxx
@@ -23,8 +23,6 @@
 #include "TrigEFBEEXFex.h"
 
 #include <math.h>
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
 
 #include "TrigTimeAlgs/TrigTimerSvc.h"
 #include "AthenaKernel/Timeout.h"
@@ -386,26 +384,16 @@ HLT::ErrorCode TrigEFBEEXFex::hltExecute(HLT::TEConstVec& inputTE, HLT::TriggerE
     
     ATH_MSG_VERBOSE("AcceptAll is set to : " << (m_acceptAll ? "True, taking all events " : "False, applying selection" ));    
     // Retrieve event info
-    int IdRun   = 0;
+//    int IdRun   = 0;
     int IdEvent = 0;
     
     // JW - Try to get the xAOD event info
-    const EventInfo* pEventInfo(0);
     const xAOD::EventInfo *evtInfo(0);
     if ( store()->retrieve(evtInfo).isFailure() ) {
-        ATH_MSG_DEBUG("Failed to get xAOD::EventInfo " );
-        // now try the old event ifo
-        if ( store()->retrieve(pEventInfo).isFailure() ) {
-            ATH_MSG_DEBUG("Failed to get EventInfo " );
-            m_mon_Errors.push_back( ERROR_No_EventInfo );
-        } else {
-            IdRun   = pEventInfo->event_ID()->run_number();
-            IdEvent = pEventInfo->event_ID()->event_number();
-            ATH_MSG_DEBUG(" Run " << IdRun << " Event " << IdEvent << " using algo " << "m_lepAlgo");
-        }// found old event info
+        ATH_MSG_WARNING("Failed to get xAOD::EventInfo " );
     }else { // found the xAOD event info
         ATH_MSG_DEBUG(" Run " << evtInfo->runNumber() << " Event " << evtInfo->eventNumber() << " using algo m_lepAlgo" );
-        IdRun   = evtInfo->runNumber();
+//        IdRun   = evtInfo->runNumber();
         IdEvent = evtInfo->eventNumber();
     } // get event info
     
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBEEXFex.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBEEXFex.h
index a0b9830449584db42026957f61d76bd2c6fac81e..9fde079ee80583e01c42a9a0efbf9f74155fb279 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBEEXFex.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBEEXFex.h
@@ -22,26 +22,10 @@
 
 // standard stuff
 #include <string>
-#include <map>
-#include <cmath> 
-// general athena stuff
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/StatusCode.h"
-#include "StoreGate/StoreGateSvc.h"
 // trigger includes
 #include "TrigInterfaces/ComboAlgo.h"
 #include "TrigSteeringEvent/TrigRoiDescriptor.h"
 #include "TrkVKalVrtFitter/TrkVKalVrtFitter.h"
-#include "TrigParticle/TrigEFBphys.h"
-#include "TrigParticle/TrigEFBphysContainer.h"
-
-//Ntuples
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/NTuple.h"
-
-//#include "TrigTimeAlgs/TrigTimerSvc.h"
-//#include "TrigTimeAlgs/TrigTimer.h"
 
 #include "Constants.h"
 #include "BtrigUtils.h"
@@ -51,11 +35,7 @@
 #include "xAODTracking/TrackParticle.h"
 #include "xAODEgamma/Electron.h"
 #include "xAODEgamma/ElectronContainer.h"
-#include "xAODTrigBphys/TrigBphys.h"
-#include "xAODTrigBphys/TrigBphysContainer.h"
-#include "xAODTrigBphys/TrigBphysAuxContainer.h"
 
-class StoreGateSvc;
 class TriggerElement;
 class Electron;
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuHypo.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuHypo.cxx
index 2a117a5f29bc7d7adfe841e47f2b50ba17c3198b..54fe1e0ba407ca3341b356726ee2817e9efb216d 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuHypo.cxx
@@ -23,8 +23,6 @@
 #include "TrigEFBMuMuHypo.h"
 
 #include <math.h>
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
 #include "xAODTrigger/TrigPassBits.h"
 #include "TrigNavigation/Navigation.h"
 
@@ -128,19 +126,9 @@ HLT::ErrorCode TrigEFBMuMuHypo::hltExecute(const HLT::TriggerElement* outputTE,
     int IdEvent = 0;
     
     // JW - Try to get the xAOD event info
-    const EventInfo* pEventInfo(0);
     const xAOD::EventInfo *evtInfo(0);
     if ( store()->retrieve(evtInfo).isFailure() ) {
-        ATH_MSG_DEBUG("Failed to get xAOD::EventInfo " );
-        // now try the old event ifo
-        if ( store()->retrieve(pEventInfo).isFailure() ) {
-            ATH_MSG_DEBUG("Failed to get EventInfo " );
-            //m_mon_Errors.push_back( ERROR_No_EventInfo );
-        } else {
-            IdRun   = pEventInfo->event_ID()->run_number();
-            IdEvent = pEventInfo->event_ID()->event_number();
-            ATH_MSG_DEBUG(" Run " << IdRun << " Event " << IdEvent );
-        }// found old event info
+        ATH_MSG_WARNING("Failed to get xAOD::EventInfo " );
     }else { // found the xAOD event info
         ATH_MSG_DEBUG(" Run " << evtInfo->runNumber() << " Event " << evtInfo->eventNumber() );
         IdRun   = evtInfo->runNumber();
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuHypo.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuHypo.h
index 581623ab58d206d83257e090f3a254adb97d5089..ce88e25bb429f6e57d9166bbb2f7d3f05eb301a9 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuHypo.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuHypo.h
@@ -22,13 +22,8 @@
 // standard stuff
 #include <string>
 // general athena stuff
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/StatusCode.h"
 #include "TrigInterfaces/HypoAlgo.h"
 
-#include "TrigParticle/TrigEFBphys.h"
-#include "TrigParticle/TrigEFBphysContainer.h"
 #include "BeamSpotConditionsData/BeamSpotData.h"
 #include "Constants.h"
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.cxx
index c9042a6dd671a14e7e5205bd8b0c5df69ede9187..26b31d7a149ed650cc3c8311380422a72b45ca60 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.cxx
@@ -33,8 +33,6 @@
 
 
 #include <math.h>
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
 
 
 #include "TrigTimeAlgs/TrigTimerSvc.h"
@@ -763,26 +761,16 @@ HLT::ErrorCode TrigEFBMuMuXFex::hltExecute(HLT::TEConstVec& inputTE, HLT::Trigge
     ATH_MSG_VERBOSE("AcceptAll is set to : " << (m_acceptAll ? "True, taking all events " : "False, applying selection" ));
     
     // Retrieve event info
-    int IdRun   = 0;
+//    int IdRun   = 0;
     int IdEvent = 0;
     
     // JW - Try to get the xAOD event info
-    const EventInfo* pEventInfo(0);
     const xAOD::EventInfo *evtInfo(0);
     if ( store()->retrieve(evtInfo).isFailure() ) {
-        ATH_MSG_DEBUG("Failed to get xAOD::EventInfo " );
-        // now try the old event ifo
-        if ( store()->retrieve(pEventInfo).isFailure() ) {
-            ATH_MSG_DEBUG("Failed to get EventInfo " );
-            m_mon_Errors.push_back( ERROR_No_EventInfo );
-        } else {
-            IdRun   = pEventInfo->event_ID()->run_number();
-            IdEvent = pEventInfo->event_ID()->event_number();
-            ATH_MSG_DEBUG(" Run " << IdRun << " Event " << IdEvent << " using algo " << "m_muonAlgo");
-        }// found old event info
+        ATH_MSG_WARNING("Failed to get xAOD::EventInfo " );
     }else { // found the xAOD event info
         ATH_MSG_DEBUG(" Run " << evtInfo->runNumber() << " Event " << evtInfo->eventNumber() << " using algo m_muonAlgo" );
-        IdRun   = evtInfo->runNumber();
+//        IdRun   = evtInfo->runNumber();
         IdEvent = evtInfo->eventNumber();
     } // get event info
     
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.h
index a2f9b1e2077b09f7e62fe1cd0500a6244e9a5781..37fefad3c983b49926b00583d68c7567a911b55f 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXFex.h
@@ -27,26 +27,10 @@
 
 // standard stuff
 #include <string>
-#include <map>
-#include <cmath> 
-// general athena stuff
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/StatusCode.h"
-#include "StoreGate/StoreGateSvc.h"
 // trigger includes
 #include "TrigInterfaces/ComboAlgo.h"
 #include "TrigSteeringEvent/TrigRoiDescriptor.h"
 #include "TrkVKalVrtFitter/TrkVKalVrtFitter.h"
-#include "TrigParticle/TrigEFBphys.h"
-#include "TrigParticle/TrigEFBphysContainer.h"
-//#include "TrigMuonEvent/TrigMuonEF.h"
-//Ntuples
-#include "GaudiKernel/INTupleSvc.h"
-#include "GaudiKernel/NTuple.h"
-
-//#include "TrigTimeAlgs/TrigTimerSvc.h"
-//#include "TrigTimeAlgs/TrigTimer.h"
 
 #include "Constants.h"
 #include "BtrigUtils.h"
@@ -60,7 +44,6 @@
 #include "xAODTrigBphys/TrigBphysContainer.h"
 #include "xAODTrigBphys/TrigBphysAuxContainer.h"
 
-class StoreGateSvc;
 class TriggerElement;
 class CombinedMuonFeature;
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXHypo.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXHypo.cxx
index 76b097ce3c93000e6c8dd44a577fc89f533c74dd..9bc75c8d0905cfe37ba4c414dd28459368e447a5 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXHypo.cxx
@@ -25,11 +25,6 @@
 //#include "TrigMuonEvent/CombinedMuonFeature.h"
 
 #include "TrigEFBMuMuXHypo.h"
-#include "TrigParticle/TrigEFBphysContainer.h"
-
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-// #include "TrigSteeringEvent/TrigPassBits.h"
 #include "xAODTrigger/TrigPassBits.h"
 
 // additions of xAOD objects
@@ -193,19 +188,10 @@ HLT::ErrorCode TrigEFBMuMuXHypo::hltExecute(const HLT::TriggerElement* outputTE,
     int IdEvent = 0;
     
     // JW - Try to get the xAOD event info
-    const EventInfo* pEventInfo(0);
     const xAOD::EventInfo *evtInfo(0);
     if ( store()->retrieve(evtInfo).isFailure() ) {
-        ATH_MSG_DEBUG("Failed to get xAOD::EventInfo " );
+        ATH_MSG_WARNING("Failed to get xAOD::EventInfo " );
         // now try the old event ifo
-        if ( store()->retrieve(pEventInfo).isFailure() ) {
-            ATH_MSG_DEBUG("Failed to get EventInfo " );
-            //mon_Errors.push_back( ERROR_No_EventInfo );
-        } else {
-            IdRun   = pEventInfo->event_ID()->run_number();
-            IdEvent = pEventInfo->event_ID()->event_number();
-            ATH_MSG_DEBUG(" Run " << IdRun << " Event " << IdEvent );
-        }// found old event info
     }else { // found the xAOD event info
         ATH_MSG_DEBUG(" Run " << evtInfo->runNumber() << " Event " << evtInfo->eventNumber() );
         IdRun   = evtInfo->runNumber();
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXHypo.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXHypo.h
index 17af30024abe50f5ff221519a7c11fb7f052551a..d083329d9419ba779b9b6620ef58425191711af5 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXHypo.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFBMuMuXHypo.h
@@ -25,13 +25,8 @@
 // standard stuff
 #include <string>
 // general athena stuff
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/StatusCode.h"
 #include "TrigInterfaces/HypoAlgo.h"
 #include "TrigInDetEvent/TrigVertexCollection.h"
-//#include "TrigParticle/TrigEFBphys.h"
-//#include "TrigParticle/TrigEFBphysContainer.h"
 
 #include "Constants.h"
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFMultiMuHypo.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFMultiMuHypo.cxx
index a883f2553e9392677b78064f44d32c3a021a76b4..32866c609f2f62b6d28f4ad8e92df290d3c8ab59 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFMultiMuHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFMultiMuHypo.cxx
@@ -20,9 +20,6 @@
 #include "TrigEFMultiMuHypo.h"
 
 #include <math.h>
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-//#include "TrigSteeringEvent/TrigPassBits.h"
 #include "xAODTrigger/TrigPassBits.h"
 
 
@@ -117,26 +114,16 @@ HLT::ErrorCode TrigEFMultiMuHypo::hltExecute(const HLT::TriggerElement* outputTE
   m_mon_FitChi2 = -1;
   m_mon_MuMumass = -1;
     // Retrieve event info
-    int IdRun   = 0;
+//    int IdRun   = 0;
     int IdEvent = 0;
     
     // JW - Try to get the xAOD event info
-    const EventInfo* pEventInfo(0);
     const xAOD::EventInfo *evtInfo(0);
     if ( store()->retrieve(evtInfo).isFailure() ) {
-        ATH_MSG_DEBUG("Failed to get xAOD::EventInfo " );
-        // now try the old event ifo
-        if ( store()->retrieve(pEventInfo).isFailure() ) {
-            ATH_MSG_DEBUG("Failed to get EventInfo " );
-            //m_mon_Errors.push_back( ERROR_No_EventInfo );
-        } else {
-            IdRun   = pEventInfo->event_ID()->run_number();
-            IdEvent = pEventInfo->event_ID()->event_number();
-            ATH_MSG_DEBUG(" Run " << IdRun << " Event " << IdEvent );
-        }// found old event info
+        ATH_MSG_WARNING("Failed to get xAOD::EventInfo " );
     }else { // found the xAOD event info
         ATH_MSG_DEBUG(" Run " << evtInfo->runNumber() << " Event " << evtInfo->eventNumber() );
-        IdRun   = evtInfo->runNumber();
+//        IdRun   = evtInfo->runNumber();
         IdEvent = evtInfo->eventNumber();
     } // get event ifo
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFMultiMuHypo.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFMultiMuHypo.h
index 0d28066f65472aef89908ee1e1686e7b3ac2f3e3..423b7cdc43640ac798cd531feb103b5baabdbff3 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFMultiMuHypo.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFMultiMuHypo.h
@@ -22,14 +22,8 @@
 // standard stuff
 #include <string>
 // general athena stuff
-#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/StatusCode.h"
 #include "TrigInterfaces/HypoAlgo.h"
 
-#include "TrigParticle/TrigEFBphys.h"
-#include "TrigParticle/TrigEFBphysContainer.h"
-
 #include "Constants.h"
 
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassFex.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassFex.h
index 48c734df80b7314d436370c9763756fab61b5d10..4e74d78a8a0e1713ff29bad746a1d4cfd7c7847e 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassFex.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassFex.h
@@ -16,8 +16,6 @@
 
 #include "TrigInterfaces/FexAlgo.h"
 
-#include "GaudiKernel/ToolHandle.h"
-
 #include "xAODMuon/Muon.h"
 #include "xAODMuon/MuonContainer.h"
 #include "xAODTrigBphys/TrigBphys.h"
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassHypo.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassHypo.cxx
index 1e9223a5da654f33ed8753d45ad11ce3a9443a43..9e1cbed9a0bc64dea88c9fdd4ac816c5ec0bef08 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassHypo.cxx
@@ -24,8 +24,6 @@
 
 
 #include <math.h>
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
 //#include "TrigSteeringEvent/TrigPassBits.h"
 #include "xAODTrigger/TrigPassBits.h"
 
@@ -90,26 +88,16 @@ HLT::ErrorCode TrigEFTrkMassHypo::hltExecute(const HLT::TriggerElement* outputTE
   m_mon_cutCounter = -1;
 
     // Retrieve event info
-    int IdRun   = 0;
+//    int IdRun   = 0;
     int IdEvent = 0;
     
     // JW - Try to get the xAOD event info
-    const EventInfo* pEventInfo(0);
     const xAOD::EventInfo *evtInfo(0);
     if ( store()->retrieve(evtInfo).isFailure() ) {
-        ATH_MSG_DEBUG("Failed to get xAOD::EventInfo " );
-        // now try the old event ifo
-        if ( store()->retrieve(pEventInfo).isFailure() ) {
-            ATH_MSG_DEBUG("Failed to get EventInfo " );
-            //m_mon_Errors.push_back( ERROR_No_EventInfo );
-        } else {
-            IdRun   = pEventInfo->event_ID()->run_number();
-            IdEvent = pEventInfo->event_ID()->event_number();
-            ATH_MSG_DEBUG(" Run " << IdRun << " Event " << IdEvent );
-        }// found old event info
+        ATH_MSG_WARNING("Failed to get xAOD::EventInfo " );
     }else { // found the xAOD event info
         ATH_MSG_DEBUG(" Run " << evtInfo->runNumber() << " Event " << evtInfo->eventNumber() );
-        IdRun   = evtInfo->runNumber();
+//        IdRun   = evtInfo->runNumber();
         IdEvent = evtInfo->eventNumber();
     } // get event ifo
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassHypo.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassHypo.h
index f5044cd2e3e08129136cc89f68312a5b3bb1b18f..e659b78e51922e8ed8849639cd512303c275508d 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassHypo.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigEFTrkMassHypo.h
@@ -7,8 +7,6 @@
 #define TRIGEFTRKMASSHYPO_H
 
 #include "TrigInterfaces/HypoAlgo.h"
-#include "TrigT1Interfaces/RecMuonRoI.h" 
-
 #include "Constants.h"
 
 class TriggerElement;
@@ -36,7 +34,6 @@ private:
     unsigned int m_countTotalRoI;
     unsigned int m_countPassedEvents;
     unsigned int m_countPassedRoIs;
-//     StoreGateSvc * m_pStoreGate;
     void handle(const Incident &); 
 
     /* monitored variables */
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuFex.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuFex.cxx
index a8d9de3bc7de32470bc3acdbb89ff9f353c6c410..84c4d7aac4d65549b23e3b3946aa202cff217168 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuFex.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuFex.cxx
@@ -12,10 +12,6 @@
 
 #include <math.h>
 
-#include "GaudiKernel/StatusCode.h"
-
-#include "EventInfo/EventInfo.h"
-
 //#include "TrigMuonEvent/CombinedMuonFeature.h"
 
 #include "TrigL2BMuMuFex.h"
@@ -28,8 +24,6 @@
 #include "TrigInDetToolInterfaces/ITrigVertexingTool.h"
 #include "TrigInDetEvent/TrigL2Vertex.h"
 
-#include "TrigParticle/TrigL2Bphys.h"
-
 #include "Constants.h"
 #include "BtrigUtils.h"
 
@@ -1209,4 +1203,4 @@ ElementLink<xAOD::IParticleContainer> TrigL2BMuMuFex::remap_container(const Elem
     // if here, then no match was found;
     // best to return the original object
     return iptlELold; // this is the old link to the IParticle
-} // remap_container
\ No newline at end of file
+} // remap_container
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuFex.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuFex.h
index 65c8bd41cca34301d92565739ebd99f32825272e..82b5ec43b369dae8f550d1b2e2202609ed1beef9 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuFex.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuFex.h
@@ -15,8 +15,6 @@
 
 #include <string>
 
-#include "GaudiKernel/ToolHandle.h"
-
 #include "TrigInterfaces/ComboAlgo.h"
 
 #include "TrigInDetEvent/TrigVertexCollection.h"
@@ -24,9 +22,6 @@
 #include "TrigInDetToolInterfaces/ITrigL2VertexFitter.h"
 
 //#include "TrigParticle/TrigL2BphysContainer.h"
-#include "xAODTrigBphys/TrigBphysContainer.h"
-#include "xAODTrigBphys/TrigBphysAuxContainer.h"
-#include "xAODTrigBphys/TrigBphys.h"
 #include "xAODTrigMuon/L2CombinedMuon.h"
 #include "xAODTrigMuon/L2CombinedMuonContainer.h"
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.h
index 6712e64ec96f779369663b35ac27f937c789a7cf..4c5ba40fd230424c4f69cd9a2e8261511077fbc7 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuHypo.h
@@ -22,9 +22,6 @@
 // standard stuff
 #include <string>
 // general athena stuff
-//#include "GaudiKernel/MsgStream.h"
-//#include "GaudiKernel/IToolSvc.h"
-//#include "GaudiKernel/StatusCode.h"
 #include "TrigInterfaces/HypoAlgo.h"
 
 //#include "TrigTimeAlgs/TrigTimerSvc.h"
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXFex.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXFex.cxx
index 717dfe6be2536af1066967348a8788283ee967c9..ad614f39898ab5397d7f854509d9e001726c2133 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXFex.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXFex.cxx
@@ -29,25 +29,16 @@
 
 #include "Constants.h"
 
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
 #include "TrigTimeAlgs/TrigTimerSvc.h"
 #include "AthenaKernel/Timeout.h"
 
-//#include "TrigMuonEvent/TrigCombDiMuonContainer.h"
-//#include "TrigMuonEvent/CombinedMuonFeature.h"
-
 #include "TrigSteeringEvent/TrigRoiDescriptor.h"
 
 #include "TrigInDetEvent/TrigInDetTrackCollection.h"
 
-#include "TrigInDetToolInterfaces/TrigParticleTable.h"                           
-#include "TrigInDetToolInterfaces/ITrigL2VertexFitter.h"                         
+#include "TrigInDetToolInterfaces/ITrigL2VertexFitter.h" 
 #include "TrigInDetEvent/TrigL2Vertex.h"                         
 
-#include "TrigParticle/TrigL2BphysContainer.h"
-
 // additions of xAOD objects
 #include "xAODEventInfo/EventInfo.h"
 #include "TrigBphysHelperUtilsTool.h"
@@ -412,10 +403,6 @@ TrigL2BMuMuXFex::TrigL2BMuMuXFex(const std::string & name, ISvcLocator* pSvcLoca
   m_trigBphysColl_bxAOD = NULL;
   m_VertexColl = NULL;
   // temporary
-  m_trigBphysColl_kStar = NULL;
-  m_trigBphysColl_phi = NULL;
-  m_trigBphysColl_lambda = NULL;
-  m_trigBphysColl_ds = NULL;
   m_trigBphysColl_kStarxAOD = NULL;
   m_trigBphysColl_phixAOD = NULL;
   m_trigBphysColl_lambdaxAOD = NULL;
@@ -427,12 +414,7 @@ TrigL2BMuMuXFex::TrigL2BMuMuXFex(const std::string & name, ISvcLocator* pSvcLoca
 /*----------------------------------------*/
 TrigL2BMuMuXFex::~TrigL2BMuMuXFex()                                            
 { 
-  if(m_trigBphysColl_b!=NULL) delete m_trigBphysColl_b; 
   if(m_VertexColl!=NULL) delete m_VertexColl;
-  if(m_trigBphysColl_kStar) delete m_trigBphysColl_kStar;
-  if(m_trigBphysColl_phi) delete m_trigBphysColl_phi;
-  if(m_trigBphysColl_lambda) delete m_trigBphysColl_lambda;
-  if(m_trigBphysColl_ds) delete m_trigBphysColl_ds;
 //  if(m_trigBphysColl_kSplus) delete m_trigBphysColl_kSplus;
  
 }
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXFex.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXFex.h
index 4a7406e7ac8f64e80d39054cd1e12c933473776a..d21a9b46fc994707e7f3d17be2ab48d1de9b4e16 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXFex.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXFex.h
@@ -22,7 +22,6 @@
 #ifndef TrigL2BMuMuXFex_h 
 #define TrigL2BMuMuXFex_h
 
-#include "GaudiKernel/StatusCode.h"
 #include "TrigInterfaces/ComboAlgo.h"
 #include "BtrigUtils.h"
 
@@ -36,8 +35,6 @@
 #include "TrigInDetToolInterfaces/ITrigL2VertexFitter.h"                         
 
 #include "TrigInDetEvent/TrigVertexCollection.h"
-#include "TrigParticle/TrigL2BphysContainer.h"
-#include "TrigParticle/TrigL2Bphys.h"
 
 #include "xAODTrigBphys/TrigBphysContainer.h"
 #include "xAODTrigBphys/TrigBphysAuxContainer.h"
@@ -238,10 +235,10 @@ class TrigL2BMuMuXFex: public HLT::ComboAlgo
     
     TrigVertexCollection* m_VertexColl;
     // temporary
-    TrigL2BphysContainer* m_trigBphysColl_kStar;   
-    TrigL2BphysContainer* m_trigBphysColl_phi;   
-    TrigL2BphysContainer* m_trigBphysColl_lambda;   
-    TrigL2BphysContainer* m_trigBphysColl_ds;
+//    TrigL2BphysContainer* m_trigBphysColl_kStar;   
+//    TrigL2BphysContainer* m_trigBphysColl_phi;   
+//    TrigL2BphysContainer* m_trigBphysColl_lambda;   
+//    TrigL2BphysContainer* m_trigBphysColl_ds;
 
     xAOD::TrigBphysContainer* m_trigBphysColl_kStarxAOD;
     xAOD::TrigBphysContainer* m_trigBphysColl_phixAOD;
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXHypo.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXHypo.h
index 54aab41ccf08f1ed6a062b306bb69e828f82e106..ae11481d5ff83025d95eaebfe445424874b8db31 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXHypo.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2BMuMuXHypo.h
@@ -19,7 +19,6 @@
 #ifndef TrigL2BMuMuXHypo_h
 #define TrigL2BMuMuXHypo_h
 
-#include "GaudiKernel/StatusCode.h"
 #include "TrigInterfaces/HypoAlgo.h"
 
 #include "Constants.h"
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2DiMuXFex.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2DiMuXFex.h
deleted file mode 100644
index 247e784e10dc513452ea98eb232acb5802e68096..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2DiMuXFex.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
- /**************************************************************************
- **
- **   File: Trigger/TrigHypothesis/TrigBphysHypo/TrigL2DiMuXFex.h
- **
- **   Description: L2 hypothesis algorithms for B+ -> K+ mu+ mu-  
- **                Create TrigL2Bphys
- **
- **   Author: C. Adorisio (Cristina.Adorisio@cern.ch)
- **
- **   Created:   08.10.2007
- **   Modified:  25.02.2008(new TrigDiMuon class)
- **              07.03.2008(monitoring histograms added)
- **
- **************************************************************************/ 
-
-#ifndef TRIG_TrigL2DiMuXFex_H 
-#define TRIG_TrigL2DiMuXFex_H
-
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "TrigInterfaces/FexAlgo.h"
-
-#include "TrigInDetEvent/TrigInDetTrackFitPar.h"
-#include "TrigInDetEvent/TrigInDetTrackCollection.h"
-
-#include "TrigParticle/TrigL2Bphys.h"
-#include "TrigParticle/TrigL2BphysContainer.h"
-#include "TrigInDetEvent/TrigVertexCollection.h"
-
-#include "TrigInDetToolInterfaces/ITrigL2VertexFitter.h"
-#include "TrigInDetToolInterfaces/ITrigVertexingTool.h"
-#include "TrigInDetToolInterfaces/ITrigVertexFitter.h"
-
-#include "Constants.h"
-#include "xAODTrigBphys/TrigBphysContainer.h"
-
-class TrigBphysHelperUtilsTool;
-
-class TrigL2DiMuXFex: public HLT::FexAlgo  
-{
-  public:
-    TrigL2DiMuXFex(const std::string & name, ISvcLocator* pSvcLocator);
-    ~TrigL2DiMuXFex();
-    HLT::ErrorCode hltInitialize();
-    HLT::ErrorCode hltFinalize();     
-    HLT::ErrorCode hltExecute(const HLT::TriggerElement* inputTE, HLT::TriggerElement* outputTE);
-            
- private:
-    ToolHandle <TrigBphysHelperUtilsTool> m_bphysHelperTool;
-
-    // to set Accept-All mode: should be done with force-accept when possible
-    BooleanProperty m_acceptAll;
-    BooleanProperty m_doVertexFit;
-
-    // Mass window cuts
-    float m_lowerMuMuMassCut;
-    float m_upperMuMuMassCut;
-    float m_lowerKplusMuMuMassCut;
-    float m_upperKplusMuMuMassCut;
-
-    //Counters
-    int m_lastEvent;
-    int m_lastEvent_DiMu;
-    unsigned int m_lastEventPassed;
-    unsigned int m_lastEventPassedMuMu;
-    unsigned int m_lastEventPassedKMuMu;
-
-    unsigned int m_countTotalEvents;
-    unsigned int m_countTotalRoI;
-    unsigned int m_countTotalEvents_DiMu;
-    unsigned int m_countTotalRoI_DiMu;
-
-    unsigned int m_countPassedEvents;
-    unsigned int m_countPassedRoIs;
-    unsigned int m_countPassedEventsMuMu;
-    unsigned int m_countPassedEventsKMuMu;
-
-    unsigned int m_countPassedMuMuMassCut;
-    unsigned int m_countPassedKMuMuMassCut;
-    unsigned int m_countPassedKMuMuVertexCut;
-
-    xAOD::TrigBphysContainer* m_trigBphysColl;
-    //TrigVertexCollection* m_VertexColl;
-
-    ToolHandle<ITrigL2VertexFitter> m_L2vertFitter;
-    ToolHandle<ITrigVertexingTool> m_vertexingTool;
-
-    TrigTimer* m_TotTimer;
-    TrigTimer* m_VtxFitTimer;
-
-    /* monitored variables*/
-    std::vector<float> mon_dimumass;
-    std::vector<float> mon_kdimumass;
-};
-
-#endif
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuFex.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuFex.cxx
index d75bf038479ab75a697e3b6181e5c797fe4ee2fd..12f80ddaa6a9b3fb1cf4d7d3ad38168b4063bfc0 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuFex.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuFex.cxx
@@ -12,13 +12,6 @@
 
 #include <math.h>
 
-#include "GaudiKernel/StatusCode.h"
-
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-
-//#include "TrigMuonEvent/CombinedMuonFeature.h"
-
 #include "TrigL2MultiMuFex.h"
 
 #include "TrigInDetEvent/TrigInDetTrackCollection.h"
@@ -30,8 +23,6 @@
 #include "TrigInDetToolInterfaces/ITrigVertexingTool.h"
 #include "TrigInDetEvent/TrigL2Vertex.h"
 
-#include "TrigParticle/TrigL2Bphys.h"
-
 #include "Constants.h"
 #include "BtrigUtils.h"
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuFex.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuFex.h
index c0b325edd8605bbe2264a99b6340caffab59f06d..52128dc642a23e8a686cdaebe73c8f529db437bb 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuFex.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuFex.h
@@ -15,8 +15,6 @@
 
 #include <string>
 
-#include "GaudiKernel/ToolHandle.h"
-
 #include "TrigInterfaces/ComboAlgo.h"
 
 #include "TrigInDetEvent/TrigVertexCollection.h"
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuHypo.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuHypo.h
index 2edca750af1e3a5bb380002003ee906c97869aae..91fcf53621f22bb39ee20d15020d4c6e2c3abde5 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuHypo.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2MultiMuHypo.h
@@ -21,10 +21,6 @@
 
 // standard stuff
 #include <string>
-// general athena stuff
-//#include "GaudiKernel/MsgStream.h"
-//#include "GaudiKernel/IToolSvc.h"
-//#include "GaudiKernel/StatusCode.h"
 #include "TrigInterfaces/HypoAlgo.h"
 
 ////#include "TrigTimeAlgs/TrigTimerSvc.h"
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassFex.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassFex.cxx
index b46647b157aadfb3c3b3ae992e4a1a5086bec7ac..d88335918518db2285b863e767ec09565d8df3b3 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassFex.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassFex.cxx
@@ -12,8 +12,6 @@
 
 #include <math.h>
 
-#include "GaudiKernel/StatusCode.h"
-
 #include "TrigL2TrkMassFex.h"
 
 
@@ -24,8 +22,6 @@
 #include "TrigInDetToolInterfaces/ITrigVertexingTool.h"
 #include "TrigInDetEvent/TrigL2Vertex.h"
 
-#include "TrigParticle/TrigL2Bphys.h"
-
 #include "Constants.h"
 #include "BtrigUtils.h"
 
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassFex.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassFex.h
index 46c322a685d02167acdeb09d250ea00e275e4b73..5af2c10de9660865c5c9746fd3a00a976a5c1ef3 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassFex.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassFex.h
@@ -15,8 +15,6 @@
 
 #include <string>
 
-#include "GaudiKernel/ToolHandle.h"
-
 #include "TrigInterfaces/FexAlgo.h"
 
 #include "TrigInDetEvent/TrigVertexCollection.h"
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassHypo.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassHypo.h
index 81a8771b58fad6155b947e7726cf4429965a67ad..bde77bb7ed012cdb836830fd4a3e04450e6e8fbc 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassHypo.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigL2TrkMassHypo.h
@@ -7,8 +7,6 @@
 #define TRIGL2TRKMASSHYPO_H
 
 #include "TrigInterfaces/HypoAlgo.h"
-#include "TrigT1Interfaces/RecMuonRoI.h" 
-
 #include "Constants.h"
 
 class TriggerElement;
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkComboHypo.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkComboHypo.h
index 69a65e5abce830f17d54abd0cdf0917aa90ff2d9..80315771043cb201a18e25fd4323fee52ec4fc16 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkComboHypo.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkComboHypo.h
@@ -17,9 +17,7 @@
 
 #include <string>
 #include <vector>
-#include <utility>
 
-#include "GaudiKernel/Property.h"
 #include "xAODTracking/TrackParticleContainer.h"
 #include "xAODMuon/MuonContainer.h"
 #include "xAODTrigger/TrigComposite.h"