diff --git a/Geometry/HcalEventSetup/python/CaloTowerGeometryDBReader_cfi.py b/Geometry/HcalEventSetup/python/CaloTowerGeometryDBReader_cfi.py
index b3ec609dc4a36..1ae683aed2ab1 100644
--- a/Geometry/HcalEventSetup/python/CaloTowerGeometryDBReader_cfi.py
+++ b/Geometry/HcalEventSetup/python/CaloTowerGeometryDBReader_cfi.py
@@ -4,5 +4,3 @@
                                             applyAlignment = cms.bool(False)
                                             )
 
-import Geometry.HcalEventSetup.hcalTopologyConstants_cfi as hcalTopologyConstants_cfi
-CaloTowerGeometryFromDBEP.hcalTopologyConstants = cms.PSet(hcalTopologyConstants_cfi.hcalTopologyConstants)
diff --git a/Geometry/HcalEventSetup/python/HcalGeometryDBReader_cfi.py b/Geometry/HcalEventSetup/python/HcalGeometryDBReader_cfi.py
index 4ce13bc2f3cb4..f65ffed260533 100644
--- a/Geometry/HcalEventSetup/python/HcalGeometryDBReader_cfi.py
+++ b/Geometry/HcalEventSetup/python/HcalGeometryDBReader_cfi.py
@@ -3,8 +3,6 @@
 HcalGeometryFromDBEP = cms.ESProducer("HcalGeometryFromDBEP",
                                       applyAlignment = cms.bool(False)
                                       )
-import Geometry.HcalEventSetup.hcalTopologyConstants_cfi as hcalTopologyConstants_cfi
-HcalGeometryFromDBEP.hcalTopologyConstants = cms.PSet(hcalTopologyConstants_cfi.hcalTopologyConstants)
 
 HcalAlignmentEP = cms.ESProducer("HcalAlignmentEP")
 
diff --git a/Geometry/HcalEventSetup/python/HcalGeometryDBWriter_cfi.py b/Geometry/HcalEventSetup/python/HcalGeometryDBWriter_cfi.py
index 2a77b65c7a10c..6475c858cd593 100644
--- a/Geometry/HcalEventSetup/python/HcalGeometryDBWriter_cfi.py
+++ b/Geometry/HcalEventSetup/python/HcalGeometryDBWriter_cfi.py
@@ -1,15 +1,12 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 HcalHardcodeGeometryEP = cms.ESProducer( "HcalHardcodeGeometryEP" ,
                                          appendToDataLabel = cms.string("_master"),
-                                         UseOldLoader = cms.bool(False),
-                                         HcalReLabel = HcalReLabel
+                                         UseOldLoader = cms.bool(False)
                                          )
 
 HcalGeometryToDBEP = cms.ESProducer( "HcalGeometryToDBEP" ,
                                      applyAlignment = cms.bool(False) ,
-                                     appendToDataLabel = cms.string("_toDB"),
-                                     HcalReLabel = HcalReLabel
+                                     appendToDataLabel = cms.string("_toDB")
                                      )
 
diff --git a/Geometry/HcalEventSetup/python/HcalGeometry_cfi.py b/Geometry/HcalEventSetup/python/HcalGeometry_cfi.py
index f9bf4bd0de09e..b534be2ebb327 100644
--- a/Geometry/HcalEventSetup/python/HcalGeometry_cfi.py
+++ b/Geometry/HcalEventSetup/python/HcalGeometry_cfi.py
@@ -1,7 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 HcalHardcodeGeometryEP = cms.ESProducer("HcalHardcodeGeometryEP" ,
-                                        UseOldLoader = cms.bool(False),
-                                        HcalReLabel = HcalReLabel
-)
+                                        UseOldLoader = cms.bool(False)
+                                        )
diff --git a/Geometry/HcalEventSetup/python/HcalHardcodeGeometry_cfi.py b/Geometry/HcalEventSetup/python/HcalHardcodeGeometry_cfi.py
index c6ced9e832466..88014bb4c5319 100644
--- a/Geometry/HcalEventSetup/python/HcalHardcodeGeometry_cfi.py
+++ b/Geometry/HcalEventSetup/python/HcalHardcodeGeometry_cfi.py
@@ -1,10 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 HcalHardcodeGeometryEP = cms.ESProducer("HcalHardcodeGeometryEP" ,
                                         appendToDataLabel = cms.string("_master"),
-                                        UseOldLoader = cms.bool(False),
-                                        HcalReLabel = HcalReLabel
+                                        UseOldLoader = cms.bool(False)
                                         )
 
 HcalGeometryFromDBEP = cms.ESProducer("HcalGeometryFromDBEP",
diff --git a/Geometry/HcalEventSetup/python/HcalTrigTowerGeometry_cfi.py b/Geometry/HcalEventSetup/python/HcalTrigTowerGeometry_cfi.py
index b99d1921bfdb2..e8531bdd0a83c 100644
--- a/Geometry/HcalEventSetup/python/HcalTrigTowerGeometry_cfi.py
+++ b/Geometry/HcalEventSetup/python/HcalTrigTowerGeometry_cfi.py
@@ -3,6 +3,3 @@
 import Geometry.HcalEventSetup.hcalTrigTowerGeometry_cfi
 
 hcalTrigTowerGeometry = Geometry.HcalEventSetup.hcalTrigTowerGeometry_cfi.hcalTrigTowerGeometry.clone()
-
-import Geometry.HcalEventSetup.hcalTopologyConstants_cfi as hcalTopologyConstants_cfi
-hcalTrigTowerGeometry.hcalTopologyConstants = cms.PSet(hcalTopologyConstants_cfi.hcalTopologyConstants)
diff --git a/Geometry/HcalTowerAlgo/test/runCaloTowerGeometryAnalyzer_cfg.py b/Geometry/HcalTowerAlgo/test/runCaloTowerGeometryAnalyzer_cfg.py
index 58b507b13b2f3..e62ec211866eb 100644
--- a/Geometry/HcalTowerAlgo/test/runCaloTowerGeometryAnalyzer_cfg.py
+++ b/Geometry/HcalTowerAlgo/test/runCaloTowerGeometryAnalyzer_cfg.py
@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 process = cms.Process("CaloTowerGeometryTest")
 
diff --git a/Geometry/HcalTowerAlgo/test/runHcalGeometryAnalyzer_cfg.py b/Geometry/HcalTowerAlgo/test/runHcalGeometryAnalyzer_cfg.py
index cc25d418cca0d..bcfccb7664ca5 100644
--- a/Geometry/HcalTowerAlgo/test/runHcalGeometryAnalyzer_cfg.py
+++ b/Geometry/HcalTowerAlgo/test/runHcalGeometryAnalyzer_cfg.py
@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 process = cms.Process("HcalGeometryTest")
 
diff --git a/Geometry/HcalTowerAlgo/test/runHcalTransGeometryAnalyzer_cfg.py b/Geometry/HcalTowerAlgo/test/runHcalTransGeometryAnalyzer_cfg.py
index 6185e2d5d3031..06658325ed6a5 100644
--- a/Geometry/HcalTowerAlgo/test/runHcalTransGeometryAnalyzer_cfg.py
+++ b/Geometry/HcalTowerAlgo/test/runHcalTransGeometryAnalyzer_cfg.py
@@ -1,23 +1,23 @@
 import FWCore.ParameterSet.Config as cms
-from Geometry.HcalEventSetup.HcalRelabel_cfi import HcalReLabel
 
 process = cms.Process("HcalGeometryTest")
 
-process.load("Configuration.Geometry.GeometryExtendedPostLS2_cff")
+process.load("Configuration.Geometry.GeometryExtended2023_cff")
+process.load("Geometry.HcalCommonData.hcalDDConstants_cff")
 process.load("Geometry.HcalEventSetup.hcalTopologyIdeal_cfi")
 
-process.HcalHardcodeGeometryEP = cms.ESProducer( "HcalHardcodeGeometryEP" ,
-                                                 appendToDataLabel = cms.string("_master"),
-                                                 HcalReLabel = HcalReLabel
-                                                 )
+process.HcalHardcodeGeometryEP = cms.ESProducer("HcalHardcodeGeometryEP" ,
+                                                UseOldLoader   = cms.bool(False),
+                                                appendToDataLabel = cms.string("_master")
+                                                )
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(1)
     )
 
 process.hga = cms.EDAnalyzer("HcalGeometryAnalyzer",
-                             HcalReLabel = HcalReLabel,
-                             HCALGeometryLabel = cms.string("_master"))
+                             UseOldLoader   = cms.bool(False),
+                             GeometryFromDB = cms.bool(False))
 
 process.Timing = cms.Service("Timing")
 process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck")