diff --git a/Reconstruction/tauRecTools/Root/CombinedP4FromRecoTaus.cxx b/Reconstruction/tauRecTools/Root/CombinedP4FromRecoTaus.cxx
index 7884e21d3c9e7f236c145414a57ff6292786c457..a312b7deeae82ed711dcb3c2583befe16a6ec3a2 100644
--- a/Reconstruction/tauRecTools/Root/CombinedP4FromRecoTaus.cxx
+++ b/Reconstruction/tauRecTools/Root/CombinedP4FromRecoTaus.cxx
@@ -17,8 +17,11 @@
 
 //_____________________________________________________________________________
 CombinedP4FromRecoTaus::CombinedP4FromRecoTaus(const std::string& name) : 
-  TauRecToolBase(name)
-{
+  TauRecToolBase(name) {
+
+  declareProperty("addCalibrationResultVariables", m_addCalibrationResultVariables = false);
+  declareProperty("addUseCaloPtFlag", m_addUseCaloPtFlag = false);
+  declareProperty("WeightFileName", m_sWeightFileName = "");
 }
 
 //_____________________________________________________________________________
diff --git a/Reconstruction/tauRecTools/Root/MvaTESEvaluator.cxx b/Reconstruction/tauRecTools/Root/MvaTESEvaluator.cxx
index cb53de053474ac9bf61e6a32bf1e04af0457ab2d..bec21ad6869af9e174c4e5f7ee2bf5966ca1b6b2 100644
--- a/Reconstruction/tauRecTools/Root/MvaTESEvaluator.cxx
+++ b/Reconstruction/tauRecTools/Root/MvaTESEvaluator.cxx
@@ -12,13 +12,12 @@
 
 //_____________________________________________________________________________
 MvaTESEvaluator::MvaTESEvaluator(const std::string& name)
-  : TauRecToolBase(name)
-{
+  : TauRecToolBase(name) {
+  declareProperty("WeightFileName", m_sWeightFileName = "");
 }
 
 //_____________________________________________________________________________
-MvaTESEvaluator::~MvaTESEvaluator()
-{
+MvaTESEvaluator::~MvaTESEvaluator() {
 }
 
 //_____________________________________________________________________________
diff --git a/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx b/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx
index db817cb9edfce28de27ccfb1ae592ca4d52260d4..f19fbc769a82cf82abe5836cd2af3355c13762ee 100644
--- a/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx
+++ b/Reconstruction/tauRecTools/Root/MvaTESVariableDecorator.cxx
@@ -6,20 +6,20 @@
 #include "tauRecTools/MvaTESVariableDecorator.h"
 #include "tauRecTools/HelperFunctions.h"
 
-#include "GaudiKernel/SystemOfUnits.h"
+#define GeV 1000
 
 //_____________________________________________________________________________
 MvaTESVariableDecorator::MvaTESVariableDecorator(const std::string& name) 
-  : TauRecToolBase(name)
-{
+  : TauRecToolBase(name) {
+  declareProperty("IncShowerSubtr", m_incShowerSubtr = true, "use shower subtracted clusters in calo calculations");
 }
 
 //_____________________________________________________________________________
-MvaTESVariableDecorator::~MvaTESVariableDecorator()
-{
+MvaTESVariableDecorator::~MvaTESVariableDecorator() {
+
 }
 
-StatusCode MvaTESVariableDecorator::initialize(){
+StatusCode MvaTESVariableDecorator::initialize() {
 
   ATH_CHECK( m_eventInfo.initialize() );
 
@@ -190,7 +190,7 @@ StatusCode MvaTESVariableDecorator::execute(xAOD::TauJet& xTau) {
   // calculate interpolated pT
   double pt_pantau  = xTau.ptPanTauCellBased();
   double pt_LC      = xTau.ptDetectorAxis();  
-  double interpolWeight = 0.5 * ( 1. + TMath::TanH( ( pt_LC/Gaudi::Units::GeV - 250. ) / 20. ) );
+  double interpolWeight = 0.5 * ( 1. + TMath::TanH( ( pt_LC/GeV - 250. ) / 20. ) );
   double LC_pantau_interpolPt = interpolWeight*pt_LC + (1.-interpolWeight)*pt_pantau;
   
   xTau.setDetail(xAOD::TauJetParameters::LC_pantau_interpolPt, (float) LC_pantau_interpolPt);
diff --git a/Reconstruction/tauRecTools/Root/TauCalibrateLC.cxx b/Reconstruction/tauRecTools/Root/TauCalibrateLC.cxx
index 1a78706b2718602c309db6bdafd9fcf7a0232afc..ad9a55c15b9cea9fff16cee48c17fe263d2394b6 100644
--- a/Reconstruction/tauRecTools/Root/TauCalibrateLC.cxx
+++ b/Reconstruction/tauRecTools/Root/TauCalibrateLC.cxx
@@ -2,8 +2,6 @@
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/SystemOfUnits.h"
-
 //tau
 #include "tauRecTools/TauCalibrateLC.h"
 #include "xAODTau/TauJet.h"
@@ -13,11 +11,18 @@
 #include "TF1.h"
 #include "TH1D.h"
 
-using Gaudi::Units::GeV;
+#define GeV 1000
 
 /********************************************************************/
 TauCalibrateLC::TauCalibrateLC(const std::string& name) :
   TauRecToolBase(name) {
+  declareProperty("calibrationFile", m_calibrationFile = "");
+  declareProperty("doEnergyCorrection", m_doEnergyCorr = false);
+  declareProperty("doPtResponse", m_doPtResponse = false);
+  declareProperty("countOnlyPileupVertices", m_countOnlyPileupVertices = false);
+  declareProperty("doAxisCorrection", m_doAxisCorr = false);
+  declareProperty("usePantauAxis", m_usePantauAxis = false);
+  declareProperty("isCaloOnly", m_isCaloOnly = false);
 }
 
 /********************************************************************/
diff --git a/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx b/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx
index cd02d423d7ac3a1646ec86db7a0743228c80ee90..423f7dc08ed3899b4395d89f8200ad42f1615a38 100644
--- a/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx
+++ b/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx
@@ -23,6 +23,8 @@
 
 TauCommonCalcVars::TauCommonCalcVars(const std::string &name) :
 TauRecToolBase(name) {
+    //if TauTrackClassifier is not run, wide&passTrkSelector==classifiedIsolation==modifiedIsolationTrack
+    declareProperty("isolationTrackType", m_isolationTrackType=xAOD::TauJetParameters::modifiedIsolationTrack);
 }
 
 //-----------------------------------------------------------------------------
@@ -87,7 +89,7 @@ StatusCode TauCommonCalcVars::execute(xAOD::TauJet& pTau) {
 
     // invariant mass of track system
     std::vector<const xAOD::TauTrack*> tauTracks = pTau.tracks(xAOD::TauJetParameters::TauTrackFlag::classifiedCharged);
-    for( const xAOD::TauTrack* trk : pTau.tracks((xAOD::TauJetParameters::TauTrackFlag) m_isolationTrackType.value()) ) tauTracks.push_back(trk);
+    for( const xAOD::TauTrack* trk : pTau.tracks((xAOD::TauJetParameters::TauTrackFlag) m_isolationTrackType) ) tauTracks.push_back(trk);
     if (tauTracks.size()> 0) {
 
         TLorentzVector sumOfTrackVector;
diff --git a/Reconstruction/tauRecTools/Root/TauEleOLRDecorator.cxx b/Reconstruction/tauRecTools/Root/TauEleOLRDecorator.cxx
index 33811dedabe9e95b515e587c3c163fbc8463f0b9..8add49ef121c27474f47814ec9dd483c61fd1549 100644
--- a/Reconstruction/tauRecTools/Root/TauEleOLRDecorator.cxx
+++ b/Reconstruction/tauRecTools/Root/TauEleOLRDecorator.cxx
@@ -9,18 +9,17 @@
  * Modified: Lorenz Hauswald
  */
 
-#include "GaudiKernel/SystemOfUnits.h"
-
 #include "tauRecTools/TauEleOLRDecorator.h"
 #include "ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h"
 #include "TFile.h"
 
-using Gaudi::Units::GeV;
+#define GeV 1000
 
 TauEleOLRDecorator::TauEleOLRDecorator(const std::string& name):
   TauRecToolBase(name),
   m_tEMLHTool(nullptr),
   m_hCutValues(nullptr){
+  declareProperty("EleOLRFile", m_sEleOLRFilePath = "");
 }
 
 TauEleOLRDecorator::~TauEleOLRDecorator(){
diff --git a/Reconstruction/tauRecTools/Root/TauIDVarCalculator.cxx b/Reconstruction/tauRecTools/Root/TauIDVarCalculator.cxx
index 9b681c2e9457519b336a0a71a487250bbaf50bb9..de9c8deaabf552a4c0b43f02e608d1da7b356451 100644
--- a/Reconstruction/tauRecTools/Root/TauIDVarCalculator.cxx
+++ b/Reconstruction/tauRecTools/Root/TauIDVarCalculator.cxx
@@ -8,8 +8,6 @@
  * Author: Lorenz Hauswald
  */
 
-#include "GaudiKernel/SystemOfUnits.h"
-
 #include "tauRecTools/HelperFunctions.h"
 #include "tauRecTools/TauIDVarCalculator.h"
 #include "xAODTracking/VertexContainer.h"  
@@ -17,7 +15,7 @@
 #include "FourMomUtils/xAODP4Helpers.h"
 #include "TLorentzVector.h"
 
-using Gaudi::Units::GeV;
+#define GeV 1000
 const float TauIDVarCalculator::LOW_NUMBER = -1111.;
 
 TauIDVarCalculator::TauIDVarCalculator(const std::string& name):
diff --git a/Reconstruction/tauRecTools/Root/TauJetBDTEvaluator.cxx b/Reconstruction/tauRecTools/Root/TauJetBDTEvaluator.cxx
index 7a1df6ddc392306a44bc0b3d20132a7198dfd700..d1bf07dc4a10eb3234e7713e4052fbaef2d3a9ce 100644
--- a/Reconstruction/tauRecTools/Root/TauJetBDTEvaluator.cxx
+++ b/Reconstruction/tauRecTools/Root/TauJetBDTEvaluator.cxx
@@ -6,8 +6,14 @@
 
 TauJetBDTEvaluator::TauJetBDTEvaluator(const std::string& name)
   : TauRecToolBase(name)
-  , m_mvaBDT(nullptr)
-{
+  , m_mvaBDT(nullptr) {
+  declareProperty("weightsFile", m_weightsFile="");
+  declareProperty("minNTracks", m_minNTracks=0);
+  declareProperty("maxNTracks", m_maxNTracks=999);
+  declareProperty("minAbsTrackEta", m_minAbsTrackEta=-1);
+  declareProperty("maxAbsTrackEta", m_maxAbsTrackEta=-1);
+  declareProperty("outputVarName", m_outputVarName="BDTJetScore");
+  declareProperty("defaultValue", m_dummyValue=-1111, "if no weightsFile, then set all taus to this value nTrack/eta ignored");
 }
 
 //________________________________________
diff --git a/Reconstruction/tauRecTools/Root/TauJetRNNEvaluator.cxx b/Reconstruction/tauRecTools/Root/TauJetRNNEvaluator.cxx
index 9a64dd3ea31d320760593aa030868b1d03f73c0b..7479447354c58b22655bc01dd6bee28ac200af1c 100644
--- a/Reconstruction/tauRecTools/Root/TauJetRNNEvaluator.cxx
+++ b/Reconstruction/tauRecTools/Root/TauJetRNNEvaluator.cxx
@@ -15,6 +15,23 @@ TauJetRNNEvaluator::TauJetRNNEvaluator(const std::string &name):
     m_net_0p(nullptr),
     m_net_1p(nullptr),
     m_net_3p(nullptr){
+    
+    declareProperty("NetworkFile0P", m_weightfile_0p = "");
+    declareProperty("NetworkFile1P", m_weightfile_1p = "");
+    declareProperty("NetworkFile3P", m_weightfile_3p = "");
+    declareProperty("OutputVarname", m_output_varname = "RNNJetScore");
+    declareProperty("MaxTracks", m_max_tracks = 10);
+    declareProperty("MaxClusters", m_max_clusters = 6);
+    declareProperty("MaxClusterDR", m_max_cluster_dr = 1.0f);
+
+    // Naming conventions for the network weight files:
+    declareProperty("InputLayerScalar", m_input_layer_scalar = "scalar");
+    declareProperty("InputLayerTracks", m_input_layer_tracks = "tracks");
+    declareProperty("InputLayerClusters", m_input_layer_clusters = "clusters");
+    declareProperty("OutputLayer", m_output_layer = "rnnid_output");
+    declareProperty("OutputNode", m_output_node = "sig_prob");
+    
+    declareProperty("IncShowerSubtr", m_incShowerSubtr = true, "use shower subtracted clusters in calo calculations");
 }
 
 TauJetRNNEvaluator::~TauJetRNNEvaluator() {}
diff --git a/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx b/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx
index cc1ab948b30aff6de8239b283b6e5c7964d80914..3d24d3e2bcc6fe07f464f5e177d51f5a35d2ac5d 100644
--- a/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx
+++ b/Reconstruction/tauRecTools/Root/TauJetRNNUtils.cxx
@@ -2,11 +2,9 @@
   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "GaudiKernel/SystemOfUnits.h"
-
 #include "tauRecTools/TauJetRNNUtils.h"
 
-using Gaudi::Units::GeV;
+#define GeV 1000
 
 namespace TauJetRNNUtils {
 
diff --git a/Reconstruction/tauRecTools/Root/TauPi0ScoreCalculator.cxx b/Reconstruction/tauRecTools/Root/TauPi0ScoreCalculator.cxx
index 8ff75ae6c0c93f0acf4492f4d0a69604e9f233f7..457eb95138c8253b21082c34acc6491699cb95c3 100644
--- a/Reconstruction/tauRecTools/Root/TauPi0ScoreCalculator.cxx
+++ b/Reconstruction/tauRecTools/Root/TauPi0ScoreCalculator.cxx
@@ -25,7 +25,9 @@ using std::string;
 
 TauPi0ScoreCalculator::TauPi0ScoreCalculator( const string& name ) :
   TauRecToolBase(name),
-  m_mvaBDT(nullptr) {
+  m_mvaBDT(nullptr)
+{
+    declareProperty("BDTWeightFile",           m_weightfile);
 }
 
 //-------------------------------------------------------------------------
diff --git a/Reconstruction/tauRecTools/Root/TauPi0Selector.cxx b/Reconstruction/tauRecTools/Root/TauPi0Selector.cxx
index d0bf1614a804a7e5077d2baaf5c28297afc205e7..c3071d1ef869dc1f0d58307140cf7727f0d64a27 100644
--- a/Reconstruction/tauRecTools/Root/TauPi0Selector.cxx
+++ b/Reconstruction/tauRecTools/Root/TauPi0Selector.cxx
@@ -19,7 +19,11 @@ using std::string;
 //-------------------------------------------------------------------------
 
 TauPi0Selector::TauPi0Selector( const string& name ) :
-    TauRecToolBase(name) {
+    TauRecToolBase(name)
+{
+    declareProperty("ClusterEtCut",             m_clusterEtCut);
+    declareProperty("ClusterBDTCut_1prong",     m_clusterBDTCut_1prong);
+    declareProperty("ClusterBDTCut_mprong",     m_clusterBDTCut_mprong);
 }
 
 //-------------------------------------------------------------------------
@@ -64,11 +68,6 @@ StatusCode TauPi0Selector::executePi0nPFO(xAOD::TauJet& pTau, xAOD::PFOContainer
     // Pi0NeutralPFOs 
     //---------------------------------------------------------------------
     int nRecoPi0s=0;
-    
-    const std::vector<float>& clusterEtCut = m_clusterEtCut.value();
-    const std::vector<float>& clusterBDTCut_1prong = m_clusterBDTCut_1prong.value();
-    const std::vector<float>& clusterBDTCut_mprong = m_clusterBDTCut_mprong.value();
-    
     for( auto neutralPFO : neutralPFOContainer )
     {
         // Set number of pi0s to 0 for all neutral PFOs. Required when rerunning on xAOD level
@@ -78,17 +77,17 @@ StatusCode TauPi0Selector::executePi0nPFO(xAOD::TauJet& pTau, xAOD::PFOContainer
         int etaBin = getPi0Cluster_etaBin( neutralPFO->cluster(0)->eta() );
 
         // Preselection
-        if(neutralPFO->p4().Et() < clusterEtCut.at(etaBin)) continue;
+        if(neutralPFO->p4().Et() < m_clusterEtCut.at(etaBin)) continue;
         if(pTau.p4().DeltaR(neutralPFO->p4()) > 0.2) continue; // TODO: Replace by shrinking cone?
 
         // BDT Selection
         float BDTScore = neutralPFO->bdtPi0Score();
         ATH_MSG_DEBUG("etaBin = " << etaBin 
-                   << ", clusterEtCut.at(etaBin) = " <<clusterEtCut.at(etaBin) 
-                   << ", clusterBDTCut_1prong.at(etaBin) = " << clusterBDTCut_1prong.at(etaBin) 
-                   << ", clusterBDTCut_mprong.at(etaBin) = " << clusterBDTCut_mprong.at(etaBin));
-        if( (pTau.nTracks()==1 && BDTScore < clusterBDTCut_1prong.at(etaBin)) 
-                || (pTau.nTracks()>1 && BDTScore < clusterBDTCut_mprong.at(etaBin)) ) continue;
+                   << ", m_clusterEtCut.at(etaBin) = " <<m_clusterEtCut.at(etaBin) 
+                   << ", m_clusterBDTCut_1prong.at(etaBin) = " << m_clusterBDTCut_1prong.at(etaBin) 
+                   << ", m_clusterBDTCut_mprong.at(etaBin) = " << m_clusterBDTCut_mprong.at(etaBin));
+        if( (pTau.nTracks()==1 && BDTScore < m_clusterBDTCut_1prong.at(etaBin)) 
+                || (pTau.nTracks()>1 && BDTScore < m_clusterBDTCut_mprong.at(etaBin)) ) continue;
 
         // Set number of pi0s
         int nHitsInEM1 = 0;
diff --git a/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx b/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx
index 09d7f52d13b23482a24032c3845c9dbae0b2c2dd..17bfc4df285418953777b4f82b1ff76b2b499dc1 100644
--- a/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx
+++ b/Reconstruction/tauRecTools/Root/TauSubstructureVariables.cxx
@@ -21,15 +21,18 @@
 
 #include "tauRecTools/KineUtils.h"
 
-
+#define GeV 1000
 const double TauSubstructureVariables::DEFAULT = -1111.;
 
 //**********************************
 // Constructor
 //**********************************
 
-TauSubstructureVariables::TauSubstructureVariables( const std::string& name ) :
-		TauRecToolBase(name) {
+TauSubstructureVariables::TauSubstructureVariables( const std::string& name )
+    : TauRecToolBase(name) {
+	declareProperty("maxPileUpCorrection", m_maxPileUpCorrection = 4 * GeV);
+	declareProperty("pileUpAlpha", m_pileUpAlpha = 1.0);
+	declareProperty("VertexCorrection", m_doVertexCorrection = false);
 }
 
 
diff --git a/Reconstruction/tauRecTools/Root/TauWPDecorator.cxx b/Reconstruction/tauRecTools/Root/TauWPDecorator.cxx
index 0db39ce22f9dfdeb42c200956ee3406c0b2d9584..138ecbac632dbf568508d28b7eaa6e6a061d0293 100644
--- a/Reconstruction/tauRecTools/Root/TauWPDecorator.cxx
+++ b/Reconstruction/tauRecTools/Root/TauWPDecorator.cxx
@@ -11,7 +11,27 @@
 
 /********************************************************************/
 TauWPDecorator::TauWPDecorator(const std::string& name) :
-  TauRecToolBase(name) {
+  TauRecToolBase(name)
+{
+  declareProperty("flatteningFile0Prong", m_file0P);
+  declareProperty("flatteningFile1Prong", m_file1P);
+  declareProperty("flatteningFile3Prong", m_file3P);
+
+  declareProperty("ScoreName", m_scoreName = "BDTJetScore");
+  declareProperty("NewScoreName", m_newScoreName = "BDTJetScoreSigTrans");
+
+  declareProperty("DefineWPs", m_defineWP=false);
+  declareProperty("UseEleBDT", m_electronMode=false);
+  
+  declareProperty("CutEnumVals", m_cut_bits);
+  declareProperty("SigEff0P", m_cut_effs_0p);
+  declareProperty("SigEff1P", m_cut_effs_1p);
+  declareProperty("SigEff3P", m_cut_effs_3p);
+
+  declareProperty("DecorWPNames", m_decoration_names);
+  declareProperty("DecorWPCutEffs0P", m_cut_effs_decoration_0p);
+  declareProperty("DecorWPCutEffs1P", m_cut_effs_decoration_1p);
+  declareProperty("DecorWPCutEffs3P", m_cut_effs_decoration_3p);
 }
 
 /********************************************************************/
diff --git a/Reconstruction/tauRecTools/tauRecTools/CombinedP4FromRecoTaus.h b/Reconstruction/tauRecTools/tauRecTools/CombinedP4FromRecoTaus.h
index f15dd6b69b8d4ae8243a1f3a5fe907af97d8d62b..8ae83f9fa25a4432b7f425df966704000e8fc742 100644
--- a/Reconstruction/tauRecTools/tauRecTools/CombinedP4FromRecoTaus.h
+++ b/Reconstruction/tauRecTools/tauRecTools/CombinedP4FromRecoTaus.h
@@ -116,10 +116,10 @@ private:
   /// size of m_modeNames
   std::vector<std::unique_ptr<TH1F>> m_correlationHists;
 
-  Gaudi::Property<bool> m_addCalibrationResultVariables{this, "addCalibrationResultVariables", false};
-  Gaudi::Property<bool> m_addUseCaloPtFlag{this, "addUseCaloPtFlag", false};
-    
-  Gaudi::Property<std::string> m_sWeightFileName{this, "WeightFileName", ""};
+  bool m_addCalibrationResultVariables;
+  bool m_addUseCaloPtFlag;
+  std::string m_sWeightFileName;
+  
   std::unique_ptr<TF1> m_Nsigma_compatibility;
 };
 
diff --git a/Reconstruction/tauRecTools/tauRecTools/MvaTESEvaluator.h b/Reconstruction/tauRecTools/tauRecTools/MvaTESEvaluator.h
index c25972d59895865360f629c0174f2d20a4c8c361..53b1f570d2a52b001e1b70741d66e9fe3a610872 100644
--- a/Reconstruction/tauRecTools/tauRecTools/MvaTESEvaluator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/MvaTESEvaluator.h
@@ -70,7 +70,7 @@ class MvaTESEvaluator
   std::unique_ptr<tauRecTools::BDTHelper> m_bdtHelper;
 
   // Configurable properties
-  Gaudi::Property<std::string> m_sWeightFileName{this, "WeightFileName", "MvaTES_20170207_v2_BDTG.weights.root"};
+  std::string m_sWeightFileName;
 };
 
 #endif // TAURECTOOLSDEV_MVATESEVALUATOR_H
diff --git a/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h b/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h
index cbc3f6065f8670c3c61d791d01bd6a703e3fd828..ca098a1ff7f4092d55fb8c3e053a1192bc19d3f2 100644
--- a/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h
@@ -30,8 +30,7 @@ class MvaTESVariableDecorator
   SG::ReadHandleKey<xAOD::EventInfo> m_eventInfo{this,"Key_eventInfo", "EventInfo", "EventInfo key"};
   SG::ReadHandleKey<xAOD::VertexContainer> m_vertexInputContainer{this,"Key_vertexInputContainer", "PrimaryVertices", "input vertex container key"};
 
-  Gaudi::Property<bool> m_incShowerSubtr {this, "IncShowerSubtr", true, "use shower subtracted clusters in calo calculations"};
-
+  bool m_incShowerSubtr;
 };
 
 
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauCalibrateLC.h b/Reconstruction/tauRecTools/tauRecTools/TauCalibrateLC.h
index 38b690bbc4902e9319ebf103e7a0ed776e84e553..a83f74e81f68bf68eab904e2d38f9c934632400a 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauCalibrateLC.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauCalibrateLC.h
@@ -6,7 +6,6 @@
 #define TAUREC_TAUCALIBRATELC_H
 
 #include "tauRecTools/TauRecToolBase.h"
-#include "GaudiKernel/ToolHandle.h"
 #include "xAODEventInfo/EventInfo.h"
 
 class TH1;
@@ -36,8 +35,6 @@ public:
 
 
 private:
-    Gaudi::Property<std::string> m_calibrationFile {this, "calibrationFile", "EnergyCalibrationLC2012.root", "energy calibration file"};
-
     static const int s_nProngBins = 2;
 
     std::vector<std::vector<std::unique_ptr<TF1>>> m_calibFunc;
@@ -49,12 +46,13 @@ private:
     int    m_nEtaBins=0;
     double m_averageNPV=0;
 
-    Gaudi::Property<bool> m_doEnergyCorr {this, "doEnergyCorrection", false, "switch for energy correction"};
-    Gaudi::Property<bool> m_doPtResponse {this, "doPtResponse", false, "switch for pt response vs pt, if false, use E response vs E"};
-    Gaudi::Property<bool> m_countOnlyPileupVertices {this, "countOnlyPileupVertices", false, "switch for counting vertices by nTracks or VxType::PileUp"};
-    Gaudi::Property<bool> m_doAxisCorr {this, "doAxisCorrection", false, "switch for eta correction"};
-    Gaudi::Property<bool> m_usePantauAxis {this, "usePantauAxis", false, "switch for overwriting calo (eta,phi) with Pantau (eta,phi)"}; 
-    Gaudi::Property<bool> m_isCaloOnly {this, "isCaloOnly", false, "switch for CaloOnly corrections"};
+    std::string m_calibrationFile; //!< energy calibration file
+    bool m_doEnergyCorr; //!< switch for energy correction
+    bool m_doPtResponse; //!< switch for pt response vs pt, if false, use E response vs E
+    bool m_countOnlyPileupVertices; //!< switch for counting vertices by nTracks or VxType::PileUp
+    bool m_doAxisCorr;   //!< switch for eta correction
+    bool m_usePantauAxis; //!< switch for overwriting calo (eta,phi) with Pantau (eta,phi) 
+    bool m_isCaloOnly;   //!< switch for CaloOnly corrections
 
     SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{this,"Key_eventInfo", "EventInfo", "EventInfo key"};
     SG::ReadHandleKey<xAOD::VertexContainer> m_vertexInputContainer{this,"Key_vertexInputContainer", "PrimaryVertices", "input vertex container key"};
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauCommonCalcVars.h b/Reconstruction/tauRecTools/tauRecTools/TauCommonCalcVars.h
index c6fdb309df615a40259fd3aa91ac18ccc7014c91..ce0f24bfc4f170bdcbb413a3c2fdaa23a620bb6a 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauCommonCalcVars.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauCommonCalcVars.h
@@ -31,9 +31,7 @@ public:
     virtual StatusCode finalize() override;  
 
 private:
-    
-    //if TauTrackClassifier is not run, wide&passTrkSelector==classifiedIsolation==modifiedIsolationTrack
-    Gaudi::Property<int> m_isolationTrackType {this, "isolationTrackType", xAOD::TauJetParameters::modifiedIsolationTrack};
+    int m_isolationTrackType;
 };
 
 #endif // TAUREC_TAUCOMMONCALCVARS_H
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauEleOLRDecorator.h b/Reconstruction/tauRecTools/tauRecTools/TauEleOLRDecorator.h
index 0b9d72c8af6739e5401c148896ffa014643272ce..0ee9de03dfbcc3dd9abd883b6bf6fa30473770e3 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauEleOLRDecorator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauEleOLRDecorator.h
@@ -35,10 +35,10 @@ class TauEleOLRDecorator: virtual public TauRecToolBase
 
  private:
   float getCutVal(float fEta, float fPt);
-  
+
+  std::string m_sEleOLRFilePath;  
   SG::ReadHandleKey<xAOD::ElectronContainer> m_electronInputContainer{this,"Key_electronInputContainer", "Electrons", "input electron container key"};
   std::unique_ptr<AsgElectronLikelihoodTool> m_tEMLHTool;
-  Gaudi::Property<std::string> m_sEleOLRFilePath {this, "EleOLRFile", "eveto_cutvals.root"};
   std::unique_ptr<TH2F> m_hCutValues;
 };
 
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauIDVarCalculator.h b/Reconstruction/tauRecTools/tauRecTools/TauIDVarCalculator.h
index 67ab21b8a0842ef7802c20589b2cdbeddc8946c3..c4624608a57ae10dbfcb38e72aa942bf15d77583 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauIDVarCalculator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauIDVarCalculator.h
@@ -37,7 +37,7 @@ class TauIDVarCalculator: public TauRecToolBase
 
   SG::ReadHandleKey<xAOD::VertexContainer> m_vertexInputContainer{this,"Key_vertexInputContainer", "PrimaryVertices", "input vertex container key"};
 
-  Gaudi::Property<bool> m_incShowerSubtr {this, "IncShowerSubtr", true, "use shower subtracted clusters in calo calculations"};
+  bool m_incShowerSubtr;
 };
 
 #endif
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauJetBDTEvaluator.h b/Reconstruction/tauRecTools/tauRecTools/TauJetBDTEvaluator.h
index 95a5d9a231e8d23702bd1b1ad06e7791ee145bff..2dfd4c945a15ee341547532e1ba4ef1889d8439b 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauJetBDTEvaluator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauJetBDTEvaluator.h
@@ -36,15 +36,13 @@ class TauJetBDTEvaluator
   StatusCode finalize() override;
   
  private:
-
-  Gaudi::Property<std::string> m_weightsFile{this, "weightsFile", ""};
-  Gaudi::Property<std::string> m_outputVarName{this, "outputVarName", "BDTJetScore"};
-
   std::unique_ptr<tauRecTools::BDTHelper> m_mvaBDT;
-  Gaudi::Property<int> m_minNTracks{this, "minNTracks", 0};
-  Gaudi::Property<int> m_maxNTracks{this, "maxNTracks", 999};
-  Gaudi::Property<float> m_minAbsTrackEta{this, "minAbsTrackEta", -1};
-  Gaudi::Property<float> m_maxAbsTrackEta{this, "maxAbsTrackEta", -1};
-  Gaudi::Property<float> m_dummyValue{this, "defaultValue", -1111, "if no weightsFile, then set all taus to this value nTrack/eta ignored"};
+  std::string m_weightsFile;
+  std::string m_outputVarName;
+  int m_minNTracks;
+  int m_maxNTracks;
+  float m_minAbsTrackEta;
+  float m_maxAbsTrackEta;
+  float m_dummyValue;
 };
 #endif
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauJetRNNEvaluator.h b/Reconstruction/tauRecTools/tauRecTools/TauJetRNNEvaluator.h
index 0d9a00e6c3c31acc32d429cff06f54303cf235a9..66125f8f0b523fc58a3db185ebc987adb368f9ff 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauJetRNNEvaluator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauJetRNNEvaluator.h
@@ -49,29 +49,27 @@ private:
                             std::vector<const xAOD::CaloCluster *> &out);
 
 private:
-    Gaudi::Property<std::string> m_output_varname {this, "OutputVarname", "RNNJetScore"};
-    // Network weight files for 0-, 1- and 3-prong taus
-    // If the filename is an empty string a default value is decorated
-    Gaudi::Property<std::string> m_weightfile_0p {this, "NetworkFile0P", ""};
-    Gaudi::Property<std::string> m_weightfile_1p {this, "NetworkFile1P", ""};
-    Gaudi::Property<std::string> m_weightfile_3p {this, "NetworkFile3P", ""};
-    Gaudi::Property<std::size_t> m_max_tracks {this, "MaxTracks", 10};
-    Gaudi::Property<std::size_t> m_max_clusters {this, "MaxClusters", 6};
-    Gaudi::Property<float> m_max_cluster_dr {this, "MaxClusterDR", 1.0f};
+    std::string m_output_varname;
+    std::string m_weightfile_0p;
+    std::string m_weightfile_1p;
+    std::string m_weightfile_3p;
+    std::size_t m_max_tracks;
+    std::size_t m_max_clusters;
+    float m_max_cluster_dr;
 
     // Configuration of the weight file
-    Gaudi::Property<std::string> m_input_layer_scalar {this, "InputLayerScalar", "scalar"};
-    Gaudi::Property<std::string> m_input_layer_tracks {this, "InputLayerTracks", "tracks"};
-    Gaudi::Property<std::string> m_input_layer_clusters {this, "InputLayerClusters", "clusters"};
-    Gaudi::Property<std::string> m_output_layer {this, "OutputLayer", "rnnid_output"};
-    Gaudi::Property<std::string> m_output_node {this, "OutputNode", "sig_prob"};
-
-    Gaudi::Property<bool> m_incShowerSubtr {this, "IncShowerSubtr", true, "use shower subtracted clusters in calo calculations"};
+    std::string m_input_layer_scalar;
+    std::string m_input_layer_tracks;
+    std::string m_input_layer_clusters;
+    std::string m_output_layer;
+    std::string m_output_node;
 
     // Wrappers for lwtnn
     std::unique_ptr<TauJetRNN> m_net_0p; //!
     std::unique_ptr<TauJetRNN> m_net_1p; //!
     std::unique_ptr<TauJetRNN> m_net_3p; //!
+
+    bool m_incShowerSubtr;
 };
 
 
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauPi0ScoreCalculator.h b/Reconstruction/tauRecTools/tauRecTools/TauPi0ScoreCalculator.h
index e43bb319459efb89d2231e5a648dd3e3e48deb87..8c01d0aac55090cef1c568c89a9a4174c37f2be4 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauPi0ScoreCalculator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauPi0ScoreCalculator.h
@@ -33,8 +33,8 @@ public:
 private:
     /** @brief function used to calculate BDT score */
     float calculateScore(const xAOD::PFO* neutralPFO);
-    
-    Gaudi::Property<std::string> m_weightfile {this, "BDTWeightFile"};
+
+    std::string m_weightfile;    
     std::unique_ptr<tauRecTools::BDTHelper> m_mvaBDT;
 };
 
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauPi0Selector.h b/Reconstruction/tauRecTools/tauRecTools/TauPi0Selector.h
index fb4f9c651c6d2e5da9947a50c4bffa6fd84902e1..0e9c5f724768c5f8d6bb9c828078ba37ef2a220a 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauPi0Selector.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauPi0Selector.h
@@ -27,9 +27,9 @@ public:
 
 private:
 
-    Gaudi::Property<std::vector<float>> m_clusterEtCut {this, "ClusterEtCut"};
-    Gaudi::Property<std::vector<float>> m_clusterBDTCut_1prong {this, "ClusterBDTCut_1prong"};
-    Gaudi::Property<std::vector<float>> m_clusterBDTCut_mprong {this, "ClusterBDTCut_mprong"};
+    std::vector<float> m_clusterEtCut;
+    std::vector<float> m_clusterBDTCut_1prong;
+    std::vector<float> m_clusterBDTCut_mprong;
     /** @brief function used to get eta bin of Pi0Cluster */
     int getPi0Cluster_etaBin(double Pi0Cluster_eta);
     /** @brief function used to calculate the visible tau 4 momentum */
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauSubstructureVariables.h b/Reconstruction/tauRecTools/tauRecTools/TauSubstructureVariables.h
index b82f247ab1a282486dcecb37fedfa2297e0b5228..a6038c22f3e4fb428f5e84a0bb09e9cf0df59616 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauSubstructureVariables.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauSubstructureVariables.h
@@ -7,8 +7,6 @@
 
 #include "tauRecTools/TauRecToolBase.h"
 
-#include "GaudiKernel/SystemOfUnits.h"
-
 /**
  * @brief Calculate variables from the tau substructure.
  * 
@@ -36,14 +34,14 @@ class TauSubstructureVariables : public TauRecToolBase
         /** Maximal pile up correction in GeV for a tau candidate.
          *  Used for the caloIso corrected variable.
          */
-        Gaudi::Property<double> m_maxPileUpCorrection {this, "maxPileUpCorrection", 4 * Gaudi::Units::GeV }; 
-        Gaudi::Property<double> m_pileUpAlpha {this, "pileUpAlpha", 1.0};         //!< slope of the pileup correction
+        double m_maxPileUpCorrection; 
+        double m_pileUpAlpha;         //!< slope of the pileup correction
         
         /** 
          * enable cell origin correction 
          * eta and phi of the cells are corrected wrt to the origin of the tau vertex
          */
-        Gaudi::Property<bool> m_doVertexCorrection {this, "VertexCorrection", false};
+        bool m_doVertexCorrection;
 };
 
 #endif
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauWPDecorator.h b/Reconstruction/tauRecTools/tauRecTools/TauWPDecorator.h
index 07c32c301c0108b75be9adf66487540b92d37b84..b8524ccfc0a29e372d0efa496efded0bebe43ee5 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauWPDecorator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauWPDecorator.h
@@ -41,10 +41,9 @@ public:
     virtual double transformScore(double score, double cut_lo, double eff_lo, double cut_hi, double eff_hi);
 
 private:
-    
-    Gaudi::Property<std::string> m_file0P {this, "flatteningFile0Prong"};
-    Gaudi::Property<std::string> m_file1P {this, "flatteningFile1Prong"};
-    Gaudi::Property<std::string> m_file3P {this, "flatteningFile3Prong"};
+    std::string m_file0P;
+    std::string m_file1P;
+    std::string m_file3P;
     
     typedef std::pair<double, std::unique_ptr<TH2> > m_pair_t;
 
@@ -58,21 +57,21 @@ private:
     std::map<int, double> m_xmax;
     std::map<int, double> m_ymax;
     
-    Gaudi::Property<bool> m_defineWP {this, "DefineWPs", false};
-    Gaudi::Property<bool> m_electronMode {this, "UseEleBDT", false};
+    bool m_defineWP;
+    bool m_electronMode;
 
-    Gaudi::Property<std::vector<int>> m_cut_bits {this, "CutEnumVals"};
-    Gaudi::Property<std::vector<float>> m_cut_effs_0p {this, "SigEff0P"};
-    Gaudi::Property<std::vector<float>> m_cut_effs_1p {this, "SigEff1P"};
-    Gaudi::Property<std::vector<float>> m_cut_effs_3p {this, "SigEff3P"};
+    std::vector<int> m_cut_bits;
+    std::vector<float> m_cut_effs_0p;
+    std::vector<float> m_cut_effs_1p;
+    std::vector<float> m_cut_effs_3p;
 
-    Gaudi::Property<std::vector<std::string>> m_decoration_names {this, "DecorWPNames"};
-    Gaudi::Property<std::vector<float>> m_cut_effs_decoration_0p {this, "DecorWPCutEffs0P"};
-    Gaudi::Property<std::vector<float>> m_cut_effs_decoration_1p {this, "DecorWPCutEffs1P"};
-    Gaudi::Property<std::vector<float>> m_cut_effs_decoration_3p {this, "DecorWPCutEffs3P"};
+    std::vector<std::string> m_decoration_names;
+    std::vector<float> m_cut_effs_decoration_0p;
+    std::vector<float> m_cut_effs_decoration_1p;
+    std::vector<float> m_cut_effs_decoration_3p;
 
-    Gaudi::Property<std::string> m_scoreName {this, "ScoreName", "BDTJetScore"};
-    Gaudi::Property<std::string> m_newScoreName {this, "NewScoreName", "BDTJetScoreSigTrans"};
+    std::string m_scoreName;
+    std::string m_newScoreName;
 
     SG::ReadHandleKey<xAOD::EventInfo> m_eventInfo{this,"Key_eventInfo", "EventInfo", "EventInfo key"};
 };