diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
index 72bc0cb26a08fd4addd701264fff65259e9712cc..6bead701c74341e6bf38f4d4b524fba52e52b119 100644
--- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
+++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
@@ -1766,9 +1766,6 @@ if not 'db' in dir():
     svcMgr += DBReplicaSvc(UseCOOLSQLite=False)
 
 
-if hasattr (svcMgr.ToolSvc, 'CaloNoiseToolDefault'):
-    ToolSvc.CaloNoiseToolDefault.RescaleForHV = False
-
 # Needed during maintanance campaign
 # if doTileMon and doTileMonDigi: ToolSvc.TileDigitsMon.FillPedestalDifference = False
 
diff --git a/TileCalorimeter/TileMonitoring/share/TileMonTopoCluster_jobOptions.py b/TileCalorimeter/TileMonitoring/share/TileMonTopoCluster_jobOptions.py
index 0c3c6d4aa3c8cce6f2c479faf51d6aaa73659205..58322c2e8550986240f4a1b55adcc0913d90854a 100644
--- a/TileCalorimeter/TileMonitoring/share/TileMonTopoCluster_jobOptions.py
+++ b/TileCalorimeter/TileMonitoring/share/TileMonTopoCluster_jobOptions.py
@@ -32,7 +32,6 @@ from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
 CaloNoiseCondAlg()
 
 from AthenaCommon.AppMgr import ToolSvc
-#ToolSvc += theCaloNoiseTool
 
 doTopoClusterLocalCalib=False
 
@@ -129,7 +128,6 @@ TileTopoMaker.ClusterEtorAbsEtCut            = 0.0*MeV
 #Double gaussian noise
 #TileTopoMaker.TwoGaussianNoise = True
 #TileTopoMaker.OutputLevel=1
-#theCaloNoiseTool.OutputLevel=1
 TileTopoMaker.TwoGaussianNoise = jobproperties.CaloTopoClusterFlags.doTwoGaussianNoise()
 
 
diff --git a/TileCalorimeter/TileMonitoring/share/TileRec_topOptions.py b/TileCalorimeter/TileMonitoring/share/TileRec_topOptions.py
index 72156ccc9624011c762c74829012fb3f87e5321b..d6b647469d941d41034393df9b59ce641db1e0cc 100644
--- a/TileCalorimeter/TileMonitoring/share/TileRec_topOptions.py
+++ b/TileCalorimeter/TileMonitoring/share/TileRec_topOptions.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 #
 
 #*****************************************************************
@@ -455,6 +455,4 @@ if TileUseCOOL:
 #if hasattr (svcMgr.ToolSvc, 'TileCellBuilder'):
 #    ToolSvc.TileCellBuilder.OutputLevel = DEBUG
 
-if hasattr (svcMgr.ToolSvc, 'CaloNoiseToolDefault'):
-    ToolSvc.CaloNoiseToolDefault.RescaleForHV = False