diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
index 25cfd6739e90c821aa1efc4994b9816cabf6d5cb..467711f9b7520561191b2970bdd4f4990afd0312 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
@@ -169,15 +169,14 @@ def CscClusterBuildCfg(flags, forTrigger=False):
 
     # Get cluster creator tool
     from CscClusterization.CscClusterizationConf import CscThresholdClusterBuilderTool
-    CscClusterBuilderTool = CscThresholdClusterBuilderTool(name = "CscThesholdClusterBuilderTool" )
+    CscClusterBuilderTool = CscThresholdClusterBuilderTool(name = "CscThresholdClusterBuilderTool" )
     acc.addPublicTool( CscClusterBuilderTool ) # This should be removed, but now defined as PublicTool at MuFastSteering 
   
     #CSC cluster building
-    if not forTrigger:
-        from CscClusterization.CscClusterizationConf import CscThresholdClusterBuilder
-        CscClusterBuilder = CscThresholdClusterBuilder(name            = "CscThesholdClusterBuilder",
-                                                       cluster_builder = CscClusterBuilderTool )
-        acc.addEventAlgo(CscClusterBuilder)
+    from CscClusterization.CscClusterizationConf import CscThresholdClusterBuilder
+    CscClusterBuilder = CscThresholdClusterBuilder(name            = "CscThresholdClusterBuilder",
+                                                   cluster_builder = CscClusterBuilderTool )
+    acc.addEventAlgo(CscClusterBuilder)
 
     return acc
 
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py
index 35522de1e27425fdbf5437d5560131506bcea9b4..711856784f377fe94827186173572c629ef3f6d7 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py
@@ -29,10 +29,10 @@ def RpcDataPreparatorCfg( flags, roisKey ):
 
     # Set Rpc data preparator for MuFast data preparator
     from TrigL2MuonSA.TrigL2MuonSAConf import TrigL2MuonSA__RpcDataPreparator
-    RpcDataPreparator = TrigL2MuonSA__RpcDataPreparator( RpcPrepDataProvider  = acc.getPublicTool( "RpcRdoToRpcPrepDataTool" ),
-                                                         RpcRawDataProvider   = acc.getPublicTool( "RPC_RawDataProviderToolMT" ),
-                                                         #DecodeBS = DetFlags.readRDOBS.RPC_on() ) # This should be used flags
-                                                         DecodeBS = True )
+    RpcDataPreparator = TrigL2MuonSA__RpcDataPreparator( RpcPrepDataProvider  = "",
+                                                         RpcRawDataProvider   = "",
+                                                         DecodeBS = False,
+                                                         DoDecoding = False )
     acc.addPublicTool( RpcDataPreparator, primary=True ) # Now this is needed, but should be removed
  
     return acc, RpcDataPreparator
@@ -56,9 +56,11 @@ def TgcDataPreparatorCfg( flags, roisKey ):
 
     # Set Tgc data preparator for MuFast data preparator
     from TrigL2MuonSA.TrigL2MuonSAConf import TrigL2MuonSA__TgcDataPreparator
-    TgcDataPreparator = TrigL2MuonSA__TgcDataPreparator( TgcPrepDataProvider  = acc.getPublicTool( "TgcRdoToTgcPrepDataTool" ) ,
-                                                         TgcRawDataProvider   = acc.getPublicTool( "TGC_RawDataProviderToolMT" ) )
-                                                         #DecodeBS = DetFlags.readRDOBS.TGC_on() ) # This should be used flags
+    TgcDataPreparator = TrigL2MuonSA__TgcDataPreparator( TgcPrepDataProvider  = "",
+                                                         TgcRawDataProvider   = "",
+                                                         DecodeBS = False,
+                                                         DoDecoding = False )
+
  
     return acc, TgcDataPreparator
 
@@ -81,10 +83,10 @@ def MdtDataPreparatorCfg( flags, roisKey ):
 
     # Set Mdt data preparator for MuFast data preparator
     from TrigL2MuonSA.TrigL2MuonSAConf import TrigL2MuonSA__MdtDataPreparator
-    MdtDataPreparator = TrigL2MuonSA__MdtDataPreparator( MdtPrepDataProvider  = acc.getPublicTool( "MdtRdoToMdtPrepDataTool" ),
-                                                         MDT_RawDataProvider   = acc.getPublicTool( "MDT_RawDataProviderToolMT" ),
-                                                         #DecodeBS = DetFlags.readRDOBS.MDT_on() ) # This should be used flags
-                                                         DecodeBS = True )
+    MdtDataPreparator = TrigL2MuonSA__MdtDataPreparator( MdtPrepDataProvider  = "",
+                                                         MDT_RawDataProvider   = "",
+                                                         DecodeBS = False,
+                                                         DoDecoding = False )
  
     return acc, MdtDataPreparator
 
@@ -112,10 +114,12 @@ def CscDataPreparatorCfg( flags, roisKey ):
 
     # Set Csc data preparator for MuFast data preparator
     from TrigL2MuonSA.TrigL2MuonSAConf import TrigL2MuonSA__CscDataPreparator
-    CscDataPreparator = TrigL2MuonSA__CscDataPreparator( CscPrepDataProvider  = acc.getPublicTool( "CscRdoToCscPrepDataTool" ),
-                                                         CscClusterProvider   = acc.getPublicTool( "CscThesholdClusterBuilderTool" ),
-                                                         CscRawDataProvider   = acc.getPublicTool( "CSC_RawDataProviderToolMT" ) )
-                                                         #DecodeBS = DetFlags.readRDOBS.CSC_on() ) # This should be used flags
+    CscDataPreparator = TrigL2MuonSA__CscDataPreparator( CscPrepDataProvider  = "",
+                                                         CscClusterProvider   = "",
+                                                         CscRawDataProvider   = "",
+                                                         DecodeBS = False,
+                                                         DoDecoding = False )
+
     acc.addPublicTool( CscDataPreparator, primary=True ) # This should be removed
  
     return acc, CscDataPreparator