diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.cxx
index 6a1bcb28219c3d827a72c116997d85a0eca6882b..cd59bb802bd77a0003ef4ac0489fb9f950756c6b 100644
--- a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.cxx
@@ -24,16 +24,10 @@ Muon::MmRdoToPrepDataToolCore::MmRdoToPrepDataToolCore(const std::string& t,
   :
   base_class(t,n,p)
 {
-  //  template for property declaration
-  declareProperty("OutputCollection",    m_mmPrepDataContainerKey = std::string("MM_Measurements"),
-		  "Muon::MMPrepDataContainer to record");
-  declareProperty("InputCollection",    m_rdoContainerKey = std::string("MMRDO"),
-		  "Muon::MMPrepDataContainer to record");
-  
-  declareProperty("MergePrds", m_merge = true);
-  declareProperty("singleStripChargeCut", m_singleStripChargeCut = 6241 * 0.4);   // 0.4 fC from BB5 cosmics
+
 }
 
+
 StatusCode Muon::MmRdoToPrepDataToolCore::initialize()
 {  
   ATH_MSG_DEBUG(" in initialize()");  
@@ -201,8 +195,7 @@ StatusCode Muon::MmRdoToPrepDataToolCore::processCollection(Muon::MMPrepDataCont
                                   calibStrip.time,
                                   calibStrip.charge,
                                   calibStrip.distDrift);
-      if (mpd.charge() < m_singleStripChargeCut)
-        continue;
+      if (mpd.charge() < m_singleStripChargeCut) continue;
       // set the hash of the MMPrepData such that it contains the correct value
       // in case it gets used in SimpleMMClusterBuilderTool::getClusters
       mpd.setHashAndIndex(hash, 0);
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.h b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.h
index 243de517ebf62cc84d6a7c512f23a9a1ff8f689f..fa0ae91c7631bc6b04310a4a1f77e482020db491 100644
--- a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.h
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.h
@@ -64,16 +64,15 @@ namespace Muon
     ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
     
     /// MdtPrepRawData containers
-    SG::WriteHandleKey<Muon::MMPrepDataContainer> m_mmPrepDataContainerKey;
-    SG::ReadHandleKey<MM_RawDataContainer> m_rdoContainerKey;
+    SG::WriteHandleKey<Muon::MMPrepDataContainer> m_mmPrepDataContainerKey {this,"OutputCollection", "MM_Measurements","Muon::MMPrepDataContainer to record"};
+    SG::ReadHandleKey<MM_RawDataContainer> m_rdoContainerKey{this,"InputCollection","MMRDO","MM RDO to read"};
 
-    std::string m_outputCollectionLocation;            
-    bool m_merge; 
+    Gaudi::Property<bool> m_merge {this,"MergePrds",true};
+    // charge cut is temporarily disabled for comissioning studies. Should be reenabled at some point. pscholer 13.05.2022
+    Gaudi::Property<float> m_singleStripChargeCut {this,"singleStripChargeCut", FLT_MIN /*6241 * 0.4*/}; // 0.4 fC from BB5 cosmics
 
     ToolHandle<IMMClusterBuilderTool> m_clusterBuilderTool{this,"ClusterBuilderTool","Muon::SimpleMMClusterBuilderTool/SimpleMMClusterBuilderTool"};
     ToolHandle<INSWCalibTool> m_calibTool{this,"NSWCalibTool","Muon::NSWCalibTool/NSWCalibTool"};
-
-    float m_singleStripChargeCut;
   }; 
 } // end of namespace