diff --git a/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py b/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
index 1e060aed4988f92849db13a8f11c366d69a04142..1b8a0355ebe97a514954cd5282b2bef462a0f0c4 100644
--- a/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
+++ b/Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
@@ -43,16 +43,6 @@ def CaloWaveformDigiCfg(flags, name="CaloWaveformDigiAlg", **kwargs):
     kwargs.setdefault("base_rms", 3)
 
     digiAlg = CompFactory.CaloWaveformDigiAlg(name, **kwargs)
-    #kwargs.setdefault("WaveformDigitisationTool", tool)
-    
-    #digiAlg.CB_alpha = -0.9
-    #digiAlg.CB_n = 10
-    #digiAlg.CB_sigma = 4
-    #digiAlg.CB_mean = 820
-    #digiAlg.CB_norm = 2
-
-    #digiAlg.base_mean = 15000
-    #digiAlg.base_rms = 3
     print(f"CaloWaveformDigiAlg normalization: {digiAlg.CB_norm}")
     print(f"CaloWaveformDigiAlg mean time: {digiAlg.CB_mean}")
 
diff --git a/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
index d2bdc1fcb0a7f6edb56ac3522f4c31de7c398a29..19b6564d8fa5f8fb0784918c064049a7c9e4c00f 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faserMDC_reco.py
@@ -177,11 +177,11 @@ acc.merge(CKF2Cfg(ConfigFlags, noDiagnostics=True))
 
 #
 # Try to write truth for mc
-if args.isMC:
-    xAODTruthCnvAlg = CompFactory.xAODMaker.xAODTruthCnvAlg
-    acc.addEventAlgo(xAODTruthCnvAlg("AOD2xAOD", 
-                                     AODContainerName="TruthEvent"), 
-                     primary=True)
+#if args.isMC:
+#    xAODTruthCnvAlg = CompFactory.xAODMaker.xAODTruthCnvAlg
+#    acc.addEventAlgo(xAODTruthCnvAlg("AOD2xAOD", 
+#                                     AODContainerName="TruthEvent"), 
+#                     primary=True)
 
 #
 # Configure output
@@ -201,12 +201,12 @@ if args.isMC:
     # Add truth records here?
     itemList.extend( ["McEventCollection#*", "TrackerSimDataCollection#*"] )
     # Try adding xAOD versions
-    itemList.extend( ["xAOD::TruthEventContainer#TruthEvents", 
-                      "xAOD::TruthEventAuxContainer#TruthEventsAux.",
-                      "xAOD::TruthVertexContainer#TruthVertices", 
-                      "xAOD::TruthVertexAuxContainer#TruthVerticesAux.",
-                      "xAOD::TruthParticleContainer#TruthParticles", 
-                      "xAOD::TruthParticleAuxContainer#TruthParticlesAux."] )
+    #itemList.extend( ["xAOD::TruthEventContainer#TruthEvents", 
+    #                  "xAOD::TruthEventAuxContainer#TruthEventsAux.",
+    #                  "xAOD::TruthVertexContainer#TruthVertices", 
+    #                  "xAOD::TruthVertexAuxContainer#TruthVerticesAux.",
+    #                  "xAOD::TruthParticleContainer#TruthParticles", 
+    #                  "xAOD::TruthParticleAuxContainer#TruthParticlesAux."] )
 
 acc.merge(OutputStreamCfg(ConfigFlags, "xAOD", itemList))