Index: CxAODTools/EventSelection.h
===================================================================
--- CxAODTools/EventSelection.h	(.../devbranches/carl)	(revision 724111)
+++ CxAODTools/EventSelection.h	(.../trunk)	(revision 724111)
@@ -17,8 +17,6 @@
 #include "MuonEfficiencyCorrections/MuonTriggerScaleFactors.h"
 #include "EventLoop/StatusCode.h"
 
-#include <TString.h>
-
 // structure to hold containers for event selection
 struct SelectionContainers {
 
@@ -54,7 +52,6 @@
 protected:
 #ifndef __MAKECINT__
   CutFlowCounter m_cutFlow;
-  TString m_sysName;
 #endif // not __MAKECINT__
   
 public:
@@ -90,8 +87,7 @@
 
   const CutFlowCounter& getCutFlowCounter() const { return m_cutFlow; }
   bool passJetCleaning(const xAOD::JetContainer* jets);
-  virtual void setSysName(const TString& name) {m_sysName = name;}
-
+  
 };
 
 #endif
Index: CxAODTools/OverlapRemoval.h
===================================================================
--- CxAODTools/OverlapRemoval.h	(.../devbranches/carl)	(revision 724111)
+++ CxAODTools/OverlapRemoval.h	(.../trunk)	(revision 724111)
@@ -1,3 +1,4 @@
+
 // Dear emacs, this is -*-c++-*-
 #ifndef CxAODTools__OverlapRemoval_H
 #define CxAODTools__OverlapRemoval_H
@@ -11,8 +12,6 @@
 
 #include "CxAODTools/ConfigStore.h"
 
-#include "AssociationUtils/DeltaRMatcher.h"
-
 class OverlapRemovalTool;
 class OverlapRemovalToolVBFGamma;
 
@@ -29,13 +28,10 @@
     bool m_applyVarOR;
     bool m_doJetLargeJetOR;
     bool m_applyVBFGammaOR;
-    bool m_applyHHbbtautauOR;
     bool m_useTauOR;
-    bool m_useTauJetOR;
     bool  m_useSetORInputLables;
     OverlapRemovalTool* m_overlapRemovalTool;
     OverlapRemovalToolVBFGamma* m_overlapRemovalToolVBFGamma;
-    ORUtils::DeltaRMatcher * m_dRMatcher;
 
   public:
     OverlapRemoval(ConfigStore & config);
@@ -75,7 +71,6 @@
 			      const xAOD::ElectronContainer* Electrons,
 			      const xAOD::MuonContainer* Muons);
   
-  void SetUseTauJetOR(bool use) {m_useTauJetOR = use;}
     
 };
 
Index: CxAODTools/CommonProperties.h
===================================================================
--- CxAODTools/CommonProperties.h	(.../devbranches/carl)	(revision 724111)
+++ CxAODTools/CommonProperties.h	(.../trunk)	(revision 724111)
@@ -83,7 +83,6 @@
 PROPERTY( BTagProps , int , isTagged )
 PROPERTY( BTagProps , float , truthTagEventWeight )
 PROPERTY( Props , const xAOD::Jet* , GAFatJet )
-PROPERTY( Props , int , isBJet )
 
 //ditau mass
 PROPERTY( Props , int , mmc_fit_status)
@@ -130,7 +129,6 @@
 //HH->bbtautau
 PROPERTY( Props , int , isBBTTSignalElectron )
 PROPERTY( Props , int , isHHLooseElectron )
-PROPERTY( Props , int , isAntiTau )
 
 PROPERTY( Props , float , effSFloose )
 PROPERTY( Props , float , effSFlooseLH )
@@ -632,7 +630,6 @@
 PROPERTY( Props , std::vector<float> , L1_ElectronPhi )
 
 PROPERTY( Props , float , MCEventWeight )
-PROPERTY( Props , float , PileupRdmRun )
 PROPERTY( Props , float , Pileupweight )
 PROPERTY( Props , float , PileupweightRecalc )
 PROPERTY( Props , float , LumiWeight )
@@ -658,7 +655,6 @@
 PROPERTY( Props , float , TTLH_sumdphi )
 PROPERTY( Props , float , TTLH_globalweight )
 PROPERTY( Props , float , TTLH_btaggingweight )
-PROPERTY( Props , int , HHbbtautauTrigger )
 
 
 // trigger match flags for photons
@@ -724,5 +720,9 @@
 PROPERTY( Props , int ,matchHLT_mu14_tau35_medium1_tracktwo_L1TAU20)
 PROPERTY( Props , int ,matchHLT_mu14_tau35_medium1_tracktwo)
 
+PROPERTY( Props , float , ptvarcone30 )
+PROPERTY( Props , float , ptvarcone20 )
+PROPERTY( Props , float , topoetcone20 )
+
 #endif // __MAKECINT__
 #endif //CxAODMaker_CommonProperties_H
Index: Root/CutFlowCounter.cxx
===================================================================
--- Root/CutFlowCounter.cxx	(.../devbranches/carl)	(revision 724111)
+++ Root/CutFlowCounter.cxx	(.../trunk)	(revision 724111)
@@ -1,5 +1,4 @@
 #include "CxAODTools/CutFlowCounter.h"
-#include <iostream>
 
 CutFlowCounter::CutFlowCounter( TString name ) :
   m_name(name),
@@ -53,7 +52,7 @@
     ncutFlow = 1;
   }
 
-  std::cout<<" ncutFlow: "<<ncutFlow<<std::endl;
+  //std::cout<<" ncutFlow: "<<ncutFlow<<std::endl;
   
   TString fullName = prefix + m_name;
 
@@ -75,7 +74,7 @@
   }
 
   for( unsigned int idx0=0; idx0<vectorToOrder.size(); idx0++ ) {
-    
+
     unsigned int tmpMin_idx = idx0;
 
     for( unsigned int idx1=idx0+1; idx1<vectorToOrder.size(); idx1++ ) {
Index: Root/EventSelection.cxx
===================================================================
--- Root/EventSelection.cxx	(.../devbranches/carl)	(revision 724111)
+++ Root/EventSelection.cxx	(.../trunk)	(revision 724111)
@@ -4,6 +4,7 @@
   m_cutFlow(cutFlowName)
 {}
 
+
 bool EventSelection::passJetCleaning(const xAOD::JetContainer* jets){
   
 
Index: Root/OverlapRemoval.cxx
===================================================================
--- Root/OverlapRemoval.cxx	(.../devbranches/carl)	(revision 724111)
+++ Root/OverlapRemoval.cxx	(.../trunk)	(revision 724111)
@@ -13,7 +13,6 @@
   m_doJetLargeJetOR(true),
   m_applyVBFGammaOR(false),
   m_useTauOR(true),
-  m_useTauJetOR(true),
   m_overlapRemovalTool(nullptr),
   m_overlapRemovalToolVBFGamma(nullptr),
   m_useSetORInputLables(true)
@@ -28,7 +27,6 @@
   m_config.getif<bool>("applyVBFGammaOR", m_applyVBFGammaOR);
   m_config.getif<bool>("useTauOR",m_useTauOR);
   m_config.getif<bool>("useSetORInputLables",m_useSetORInputLables);
-  m_config.getif<bool>("applyHHbbtautauOR",m_applyHHbbtautauOR);
 
 }
   
@@ -61,8 +59,6 @@
 
   if (m_applyORlargeR) TOOL_CHECK("OverlapRemoval::initialize()",((OverlapRemovalToolLargeR*) m_overlapRemovalTool)->setProperty("doJetLargeJetOR", m_doJetLargeJetOR));
 
-  
-  if (m_useTauJetOR) TOOL_CHECK("OverlapRemoval::initialize()", m_overlapRemovalTool->setProperty("TauJetDRCone", 0));
 
   TOOL_CHECK("OverlapRemoval::initialize()", m_overlapRemovalTool->initialize());
   }
@@ -85,10 +81,6 @@
   TOOL_CHECK("OverlapRemoval::initialize()", m_overlapRemovalToolVBFGamma->initialize());
   }
 
-  // initialise DeltaRMatcher for HHbbtautau OR
-  double dR = 0.4;
-  bool useRapidity = true;
-  m_dRMatcher = new ORUtils::DeltaRMatcher(dR,useRapidity);
   
   return EL::StatusCode::SUCCESS;
 }
@@ -160,12 +152,12 @@
   // taus and photons can be nulptrs - do not apply photon OR, but use method below!
   // electrons, muons and jets need to be valid pointers
   if ( electrons && muons && jets ) {
-  if (!m_applyVBFGammaOR || !m_applyHHbbtautauOR) {
+  if (!m_applyVBFGammaOR) {
     if (!m_overlapRemovalTool) {
       Error("OverlapRemoval::removeOverlap()", "OverlapRemovalTool not initialized!");
       return EL::StatusCode::FAILURE;
     }
-    if(m_useTauOR) {      
+    if(m_useTauOR) {
       EL_CHECK("OverlapRemoval::removeOverlap()",m_overlapRemovalTool->removeOverlaps(electrons, muons, jets, taus, photons));
     } else {
       EL_CHECK("OverlapRemoval::removeOverlap()",m_overlapRemovalTool->removeOverlaps(electrons, muons, jets, nullptr,  photons));
@@ -228,42 +220,6 @@
     } 
   }
   }
-
-  if(m_applyHHbbtautauOR){
-    const xAOD::JetContainer* nullJets = new xAOD::JetContainer();
-    const xAOD::TauJetContainer* nullTaus = new xAOD::TauJetContainer();
-    const xAOD::ElectronContainer* nullEls = new xAOD::ElectronContainer();
-    const xAOD::MuonContainer* nullMuons = new xAOD::MuonContainer();
-
-    EL_CHECK("OverlapRemoval::removeOverlap()",m_overlapRemovalTool->removeOverlaps(electrons, nullMuons, nullJets, taus));// Electrons and taus
-    EL_CHECK("OverlapRemoval::removeOverlap()",m_overlapRemovalTool->removeOverlaps(nullEls, muons, nullJets, taus));// Muons and taus
-    EL_CHECK("OverlapRemoval::removeOverlap()",m_overlapRemovalTool->removeOverlaps(electrons, muons, nullJets, nullTaus));// Electrons and muons
-    EL_CHECK("OverlapRemoval::removeOverlap()",m_overlapRemovalTool->removeOverlaps(electrons, nullMuons, jets, nullTaus));// Electrons and jets
-    EL_CHECK("OverlapRemoval::removeOverlap()",m_overlapRemovalTool->removeOverlaps(nullEls, muons, jets, nullTaus));// Muons and jets
-
-    for(const auto jet : * jets){
-      if(!Props::ORInputLabel.get(jet) || Props::OROutputLabel.get(jet)) continue;
-      bool isBTagged = Props::isBJet.get(jet);
-
-      for(const auto tau : * taus){
-	if(!Props::ORInputLabel.get(tau) || Props::OROutputLabel.get(tau)) continue;
-	bool isAntiTau = Props::isAntiTau.get(tau);
-	bool isOverlap = false;
-	isOverlap = m_dRMatcher->objectsMatch(*jet,*tau);
-
-	if(isBTagged  && isAntiTau && isOverlap){ Props::OROutputLabel.set(tau, true); }// b-jet and anti-tau overlapping
-
-	if(isOverlap){
-	  bool tempTauOR = Props::OROutputLabel.get(tau);
-	  bool tempJetOR = Props::OROutputLabel.get(jet);
-	  std::cout << "BaseOR, " << "Overlapping: " << isOverlap << ", BTagJet: " << isBTagged <<  ", AntiTau: " << isAntiTau << ", TauOR: " << tempTauOR << ", JetOR: " << tempJetOR << std::endl;
-	}
-
-      }
-
-    }
-
-  }
   
   getOROutputLabels(electrons,  photons, muons,  taus, jets, fatjets);