From 44ce8eb935fb9d47f388994d9692dce8d7d7da07 Mon Sep 17 00:00:00 2001
From: Kevin Pedro <kpedro88@gmail.com>
Date: Fri, 10 Jul 2020 12:19:27 -0500
Subject: [PATCH] remove deprecated phase 2 geometries, update D47->D60 and
 D55->D61

---
 Configuration/Geometry/README.md              |  35 +-
 .../GeometryDD4hepExtended2026D41_cff.py      |  30 -
 .../python/GeometryExtended2026D35Reco_cff.py |  60 --
 .../python/GeometryExtended2026D35_cff.py     |  14 -
 .../python/GeometryExtended2026D41Reco_cff.py |  60 --
 .../python/GeometryExtended2026D41_cff.py     |  14 -
 .../python/GeometryExtended2026D43Reco_cff.py |  60 --
 .../python/GeometryExtended2026D43_cff.py     |  14 -
 .../python/GeometryExtended2026D44Reco_cff.py |  63 --
 .../python/GeometryExtended2026D46Reco_cff.py |  60 --
 .../python/GeometryExtended2026D46_cff.py     |  14 -
 .../python/GeometryExtended2026D47_cff.py     |  17 -
 .../python/GeometryExtended2026D48Reco_cff.py |  60 --
 .../python/GeometryExtended2026D48_cff.py     |  14 -
 .../python/GeometryExtended2026D55Reco_cff.py |  60 --
 .../python/GeometryExtended2026D55_cff.py     |  14 -
 ....py => GeometryExtended2026D60Reco_cff.py} |   2 +-
 ..._cff.py => GeometryExtended2026D60_cff.py} |   2 +-
 ....py => GeometryExtended2026D61Reco_cff.py} |   2 +-
 ..._cff.py => GeometryExtended2026D61_cff.py} |   2 +-
 .../Geometry/python/dict2026Geometry.py       | 625 +-----------------
 .../python/DD4hep_GeometrySimPhase2_cff.py    |   2 +-
 .../StandardSequences/python/GeometryConf.py  |  11 +-
 .../dd4hep/cmsExtendedGeometry2026D35.xml     | 124 ----
 .../dd4hep/cmsExtendedGeometry2026D41.xml     | 123 ----
 .../dd4hep/cmsExtendedGeometry2026D43.xml     | 124 ----
 .../dd4hep/cmsExtendedGeometry2026D44.xml     | 131 ----
 .../dd4hep/cmsExtendedGeometry2026D45.xml     | 123 ----
 .../dd4hep/cmsExtendedGeometry2026D45NoSD.xml | 111 ----
 .../dd4hep/cmsExtendedGeometry2026D46.xml     | 123 ----
 .../dd4hep/cmsExtendedGeometry2026D48.xml     | 123 ----
 ...D47.xml => cmsExtendedGeometry2026D60.xml} |  29 +-
 ...D55.xml => cmsExtendedGeometry2026D61.xml} |  10 +-
 .../cmsExtendedGeometry2026D35XML_cfi.py      | 128 ----
 .../cmsExtendedGeometry2026D41XML_cfi.py      | 127 ----
 .../cmsExtendedGeometry2026D43XML_cfi.py      | 128 ----
 .../cmsExtendedGeometry2026D44XML_cfi.py      | 135 ----
 .../cmsExtendedGeometry2026D45NoSDXML_cfi.py  | 114 ----
 .../cmsExtendedGeometry2026D45XML_cfi.py      | 127 ----
 .../cmsExtendedGeometry2026D46XML_cfi.py      | 127 ----
 .../cmsExtendedGeometry2026D48XML_cfi.py      | 127 ----
 ...y => cmsExtendedGeometry2026D60XML_cfi.py} |  29 +-
 ...y => cmsExtendedGeometry2026D61XML_cfi.py} |  10 +-
 43 files changed, 63 insertions(+), 3245 deletions(-)
 delete mode 100644 Configuration/Geometry/python/GeometryDD4hepExtended2026D41_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D35Reco_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D35_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D41Reco_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D41_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D43Reco_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D43_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D44Reco_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D46Reco_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D46_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D47_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D48Reco_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D48_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D55Reco_cff.py
 delete mode 100644 Configuration/Geometry/python/GeometryExtended2026D55_cff.py
 rename Configuration/Geometry/python/{GeometryExtended2026D47Reco_cff.py => GeometryExtended2026D60Reco_cff.py} (97%)
 rename Configuration/Geometry/python/{GeometryExtended2026D44_cff.py => GeometryExtended2026D60_cff.py} (93%)
 rename Configuration/Geometry/python/{GeometryExtended2026D45Reco_cff.py => GeometryExtended2026D61Reco_cff.py} (97%)
 rename Configuration/Geometry/python/{GeometryExtended2026D45_cff.py => GeometryExtended2026D61_cff.py} (92%)
 delete mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D35.xml
 delete mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D41.xml
 delete mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D43.xml
 delete mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D44.xml
 delete mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D45.xml
 delete mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D45NoSD.xml
 delete mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D46.xml
 delete mode 100644 Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D48.xml
 rename Geometry/CMSCommonData/data/dd4hep/{cmsExtendedGeometry2026D47.xml => cmsExtendedGeometry2026D60.xml} (90%)
 rename Geometry/CMSCommonData/data/dd4hep/{cmsExtendedGeometry2026D55.xml => cmsExtendedGeometry2026D61.xml} (98%)
 delete mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2026D35XML_cfi.py
 delete mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2026D41XML_cfi.py
 delete mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2026D43XML_cfi.py
 delete mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2026D44XML_cfi.py
 delete mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2026D45NoSDXML_cfi.py
 delete mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2026D45XML_cfi.py
 delete mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2026D46XML_cfi.py
 delete mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2026D48XML_cfi.py
 rename Geometry/CMSCommonData/python/{cmsExtendedGeometry2026D47XML_cfi.py => cmsExtendedGeometry2026D60XML_cfi.py} (90%)
 rename Geometry/CMSCommonData/python/{cmsExtendedGeometry2026D55XML_cfi.py => cmsExtendedGeometry2026D61XML_cfi.py} (94%)

diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
index 31899907e468d..ddfa7958a54ef 100644
--- a/Configuration/Geometry/README.md
+++ b/Configuration/Geometry/README.md
@@ -5,45 +5,31 @@ The Phase2 geometries are automatically created using the script [generate2026Ge
 Different versions of various subdetectors can be combined. The available versions are:
 
 Tracker:
-* T5: Phase2 tilted tracker (v6.1.3) w/ phase 2 pixel (v4.0.2.5) 
-* T6: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.0.4) (TEDD slighly rotated + Inner Tracker barrel has lower radii than TDR T5 geometry)
-* T14: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Based from T12. OT: reduced envelope. IT: new chip size, different radii, 2x2 modules everywhere in TEPX, new ring paradigm in TEPX)
 * T15: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Active geometry: same as T14. Material Budget: major update in IT, gathering info from recent Mechanical designs.)
-* T16: Active geometry: skewed Inner Tracker geometry. Material Budget: same as T15.
 * T17: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.5) TFPX: Changed sensors spacing within all double-disks + Increased distance between Disks 6 and 7 + Put TBPX portcards between Disks 6 and 7.
 * T19: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v7.0.0) Inner Tracker description with 3D sensors in TBPX L1 + TBPX L2 + TFPX R1.
 * T20: Phase2 tilted tracker (v6.1.6) Outer Tracker: All sensors 200 um -> 290 um + Update in Module MB + PS modules: s-sensor 164 um longer + Major update in OTST MB. Inner Tracker: (v6.1.5) from T17 is called.
 
 Calorimeters:
-* C4: HGCal (v9) + Phase2 HCAL and EB
-* C6: HGCal (v9) + HFNose + Phase2 HCAL and EB
-* C8: HGCal (v10 post TDR HGCal Geometry) + Phase2 HCAL and EB + Tracker cables in calorimeter region
-* C9: HGCal (v11 post TDR HGCal Geometry same as C8 + corner centering for HE part)
+* C9: HGCal (v11 post TDR HGCal Geometry w/ corner centering for HE part) + Phase2 HCAL and EB + Tracker cables
 * C10: HGCal (as in C9) + HFNose with corrected wafer size + Phase2 HCAL and EB
 * C11: HGCal (v12 post TDR HGCal Geometry same as C9 + modified support structure + full list of masked wafers)
 * C12: HGCal (as in C11) + HFNose with corrected wafer size + Phase2 HCAL and EB
 * C13: HGCal (reading the constants of the flat file and made provision to be used downstream) + Phase2 HCAL and EB
 
 Muon system:
-* M2: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1)
-* M3: same as M2 with change to the number of iRPC strips from 192 to 96 as in TDR
-* M4: same as M3 but no Overlaps inside the Muon System and MB4Shields completed
+* M4: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1), 96 iRPC strips, no overlaps, MB4Shields
 * M5: same as M4 but with: the right value for YE3 size, no "hidden" overlaps inside the Muon System and iRPC updated.
 * M6: same as M5 but with adjustment of ME0 in view of updated boundaries
 * M7: same as M6 with further ajustment of ME0 for boundaries
 
 Fast Timing system:
-* I5: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along z flat
-* I7: Fast Timing detector (LYSO barrel, silicon endcap), full description with passive materials, LYSO bars along phi flat
-* I9: Same as I7 but with ETL in the position defined in O3
-* I10: Same as I9 w/ material adjustments
+* I10: Fast Timing detector (LYSO barrel (bars along phi flat), silicon endcap), w/ passive materials, ETL in position defined in O4, material adjustments
 * I11: Same as I10, xml reorganized, comparison base for new ETL and DD4hep migration
 * I12: Starting from I11, new ETL layout from MTD TDR
 
 The script also handles the common and forward elements of the geometry:
-* O2: detailed cavern description
-* O3: O2 + changes due to modified CALO region due to changes in the Endcap part
-* O4: same as O3 but no Overlaps inside the Muon System 
+* O4: detailed cavern description, changes for modified CALO region for endcap part, no overlaps inside the Muon System 
 * O5: same as O4 but with changes needed for new support structure 
 * O6: same as O5 with changes needed for new defintion of boundaries
 * F2: modifications needed to accommodate detailed cavern, ZDC description is removed.
@@ -53,23 +39,16 @@ The script also handles the common and forward elements of the geometry:
 * F6: same as F4 with modifications needed for BRM and forward shield
 
 Several detector combinations have been generated:
-* D35 = T6+C4+M2+I5+O2+F2 
-* D41 = T14+C8+M3+I9+O3+F2
-* D43 = T14+C4+M3+I7+O2+F2
-* D44 = T14+C6+M3+I7+O2+F3
-* D45 = T15+C8+M3+I10+O3+F2
-* D46 = T15+C9+M3+I10+O3+F2
-* D47 = T15+C10+M3+I10+O3+F3
-* D48 = T16+C9+M3+I10+O3+F2
 * D49 = T15+C9+M4+I10+O4+F2
 * D50 = T15+C9+M4+I11+O4+F2
 * D51 = T17+C9+M4+I10+O4+F2
 * D53 = T15+C9+M4+I12+O4+F2
 * D54 = T19+C9+M4+I10+O4+F2
-* D55 = T19+C9+M5+I10+O4+F2
 * D56 = T20+C9+M4+I10+O4+F2
 * D57 = T17+C11+M6+I11+O5+F4
 * D58 = T17+C12+M6+I11+O5+F5
 * D59 = T17+C13+M7+I11+O6+F6
+* D60 = T15+C10+M4+I10+O4+F3
+* D61 = T17+C9+M5+I10+O4+F2
 
-D35 is the MTD TDR baseline, D41 is the L1T TDR baseline, and D49 is the HLT TDR baseline.
+D49 is the HLT TDR baseline.
diff --git a/Configuration/Geometry/python/GeometryDD4hepExtended2026D41_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtended2026D41_cff.py
deleted file mode 100644
index 41ac32a0ad63b..0000000000000
--- a/Configuration/Geometry/python/GeometryDD4hepExtended2026D41_cff.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-#
-# Geometry master configuration
-#
-# Ideal geometry, needed for simulation
-DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                    confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D41.xml'),
-                                    appendToDataLabel = cms.string('')
-)
-
-DDSpecParRegistryESProducer = cms.ESProducer("DDSpecParRegistryESProducer",
-                                             appendToDataLabel = cms.string('')
-)
-
-DDVectorRegistryESProducer = cms.ESProducer("DDVectorRegistryESProducer",
-                                            appendToDataLabel = cms.string(''))
-
-DDCompactViewESProducer = cms.ESProducer("DDCompactViewESProducer",
-                                         appendToDataLabel = cms.string('')
-)
-
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
-from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
-from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
-from Geometry.MuonNumbering.muonGeometryConstants_cff import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D35Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D35Reco_cff.py
deleted file mode 100644
index e6d5c273b6002..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D35Reco_cff.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Configuration.Geometry.GeometryExtended2026D35_cff import *
-
-# tracker
-from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
-from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
-from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
-
-# calo
-from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
-from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
-from Geometry.CaloEventSetup.CaloTopology_cfi import *
-from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
-CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
-    SelectedCalos = cms.vstring("HCAL",
-                                "ZDC",
-                                "EcalBarrel",
-                                "TOWER",
-                                "HGCalEESensitive",
-                                "HGCalHESiliconSensitive",
-                                "HGCalHEScintillatorSensitive"
-    )
-)
-from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
-from Geometry.HcalEventSetup.HcalGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
-from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
-from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
-from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
-from Geometry.EcalMapping.EcalMapping_cfi import *
-from Geometry.EcalMapping.EcalMappingRecord_cfi import *
-
-# muon
-from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
-from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
-from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
-from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
-
-# forward
-from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
-
-# timing
-from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
-from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
-from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
-mtdGeometry.applyAlignment = cms.bool(False)
-
diff --git a/Configuration/Geometry/python/GeometryExtended2026D35_cff.py b/Configuration/Geometry/python/GeometryExtended2026D35_cff.py
deleted file mode 100644
index 78ce889815ef7..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D35_cff.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Geometry.CMSCommonData.cmsExtendedGeometry2026D35XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *
-from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
-from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
-from Geometry.MuonNumbering.muonGeometryConstants_cff import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D41Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D41Reco_cff.py
deleted file mode 100644
index 0ddaf4178c68e..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D41Reco_cff.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Configuration.Geometry.GeometryExtended2026D41_cff import *
-
-# tracker
-from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
-from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
-from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
-
-# calo
-from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
-from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
-from Geometry.CaloEventSetup.CaloTopology_cfi import *
-from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
-CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
-    SelectedCalos = cms.vstring("HCAL",
-                                "ZDC",
-                                "EcalBarrel",
-                                "TOWER",
-                                "HGCalEESensitive",
-                                "HGCalHESiliconSensitive",
-                                "HGCalHEScintillatorSensitive"
-    )
-)
-from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
-from Geometry.HcalEventSetup.HcalGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
-from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
-from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
-from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
-from Geometry.EcalMapping.EcalMapping_cfi import *
-from Geometry.EcalMapping.EcalMappingRecord_cfi import *
-
-# muon
-from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
-from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
-from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
-from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
-
-# forward
-from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
-
-# timing
-from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
-from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
-from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
-mtdGeometry.applyAlignment = cms.bool(False)
-
diff --git a/Configuration/Geometry/python/GeometryExtended2026D41_cff.py b/Configuration/Geometry/python/GeometryExtended2026D41_cff.py
deleted file mode 100644
index a00cdad2524ec..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D41_cff.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Geometry.CMSCommonData.cmsExtendedGeometry2026D41XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
-from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
-from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
-from Geometry.MuonNumbering.muonGeometryConstants_cff import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D43Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D43Reco_cff.py
deleted file mode 100644
index 360bfa7b18e74..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D43Reco_cff.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Configuration.Geometry.GeometryExtended2026D43_cff import *
-
-# tracker
-from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
-from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
-from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
-
-# calo
-from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
-from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
-from Geometry.CaloEventSetup.CaloTopology_cfi import *
-from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
-CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
-    SelectedCalos = cms.vstring("HCAL",
-                                "ZDC",
-                                "EcalBarrel",
-                                "TOWER",
-                                "HGCalEESensitive",
-                                "HGCalHESiliconSensitive",
-                                "HGCalHEScintillatorSensitive"
-    )
-)
-from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
-from Geometry.HcalEventSetup.HcalGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
-from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
-from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
-from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
-from Geometry.EcalMapping.EcalMapping_cfi import *
-from Geometry.EcalMapping.EcalMappingRecord_cfi import *
-
-# muon
-from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
-from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
-from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
-from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
-
-# forward
-from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
-
-# timing
-from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
-from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
-from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
-mtdGeometry.applyAlignment = cms.bool(False)
-
diff --git a/Configuration/Geometry/python/GeometryExtended2026D43_cff.py b/Configuration/Geometry/python/GeometryExtended2026D43_cff.py
deleted file mode 100644
index 1ab53f24dc019..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D43_cff.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Geometry.CMSCommonData.cmsExtendedGeometry2026D43XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
-from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
-from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
-from Geometry.MuonNumbering.muonGeometryConstants_cff import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D44Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D44Reco_cff.py
deleted file mode 100644
index fc8c2437352c2..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D44Reco_cff.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Configuration.Geometry.GeometryExtended2026D44_cff import *
-
-# tracker
-from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
-from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
-from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
-
-# calo
-from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
-from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
-from Geometry.CaloEventSetup.HFNoseTopology_cfi import *
-from Geometry.ForwardGeometry.HFNoseGeometryESProducer_cfi import *
-from Geometry.CaloEventSetup.CaloTopology_cfi import *
-from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
-CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
-    SelectedCalos = cms.vstring("HCAL",
-                                "ZDC",
-                                "EcalBarrel",
-                                "TOWER",
-                                "HGCalEESensitive",
-                                "HGCalHESiliconSensitive",
-                                "HGCalHEScintillatorSensitive",
-                                "HGCalHFNoseSensitive",
-    )
-)
-from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
-from Geometry.HcalEventSetup.HcalGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
-from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
-from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
-from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
-from Geometry.EcalMapping.EcalMapping_cfi import *
-from Geometry.EcalMapping.EcalMappingRecord_cfi import *
-
-# muon
-from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
-from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
-from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
-from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
-
-# forward
-from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
-
-# timing
-from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
-from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
-from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
-mtdGeometry.applyAlignment = cms.bool(False)
-
diff --git a/Configuration/Geometry/python/GeometryExtended2026D46Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D46Reco_cff.py
deleted file mode 100644
index 476cb25ff1513..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D46Reco_cff.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Configuration.Geometry.GeometryExtended2026D46_cff import *
-
-# tracker
-from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
-from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
-from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
-
-# calo
-from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
-from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
-from Geometry.CaloEventSetup.CaloTopology_cfi import *
-from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
-CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
-    SelectedCalos = cms.vstring("HCAL",
-                                "ZDC",
-                                "EcalBarrel",
-                                "TOWER",
-                                "HGCalEESensitive",
-                                "HGCalHESiliconSensitive",
-                                "HGCalHEScintillatorSensitive"
-    )
-)
-from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
-from Geometry.HcalEventSetup.HcalGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
-from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
-from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
-from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
-from Geometry.EcalMapping.EcalMapping_cfi import *
-from Geometry.EcalMapping.EcalMappingRecord_cfi import *
-
-# muon
-from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
-from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
-from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
-from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
-
-# forward
-from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
-
-# timing
-from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
-from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
-from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
-mtdGeometry.applyAlignment = cms.bool(False)
-
diff --git a/Configuration/Geometry/python/GeometryExtended2026D46_cff.py b/Configuration/Geometry/python/GeometryExtended2026D46_cff.py
deleted file mode 100644
index 47722bc586826..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D46_cff.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Geometry.CMSCommonData.cmsExtendedGeometry2026D46XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
-from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
-from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
-from Geometry.MuonNumbering.muonGeometryConstants_cff import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D47_cff.py b/Configuration/Geometry/python/GeometryExtended2026D47_cff.py
deleted file mode 100644
index ab11e2b2a5ac7..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D47_cff.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Geometry.CMSCommonData.cmsExtendedGeometry2026D47XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
-from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
-from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
-from Geometry.ForwardCommonData.hfnoseParametersInitialization_cfi import *
-from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi  import *
-from Geometry.MuonNumbering.muonGeometryConstants_cff import *
-
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D48Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D48Reco_cff.py
deleted file mode 100644
index d4f908a559206..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D48Reco_cff.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Configuration.Geometry.GeometryExtended2026D48_cff import *
-
-# tracker
-from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
-from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
-from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
-
-# calo
-from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
-from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
-from Geometry.CaloEventSetup.CaloTopology_cfi import *
-from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
-CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
-    SelectedCalos = cms.vstring("HCAL",
-                                "ZDC",
-                                "EcalBarrel",
-                                "TOWER",
-                                "HGCalEESensitive",
-                                "HGCalHESiliconSensitive",
-                                "HGCalHEScintillatorSensitive"
-    )
-)
-from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
-from Geometry.HcalEventSetup.HcalGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
-from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
-from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
-from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
-from Geometry.EcalMapping.EcalMapping_cfi import *
-from Geometry.EcalMapping.EcalMappingRecord_cfi import *
-
-# muon
-from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
-from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
-from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
-from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
-
-# forward
-from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
-
-# timing
-from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
-from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
-from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
-mtdGeometry.applyAlignment = cms.bool(False)
-
diff --git a/Configuration/Geometry/python/GeometryExtended2026D48_cff.py b/Configuration/Geometry/python/GeometryExtended2026D48_cff.py
deleted file mode 100644
index 86b4e40596e51..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D48_cff.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Geometry.CMSCommonData.cmsExtendedGeometry2026D48XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
-from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
-from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
-from Geometry.MuonNumbering.muonGeometryConstants_cff import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D55Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D55Reco_cff.py
deleted file mode 100644
index fa28c1b2c5629..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D55Reco_cff.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Configuration.Geometry.GeometryExtended2026D55_cff import *
-
-# tracker
-from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
-from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
-from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
-
-# calo
-from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
-from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
-from Geometry.CaloEventSetup.CaloTopology_cfi import *
-from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
-CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
-    SelectedCalos = cms.vstring("HCAL",
-                                "ZDC",
-                                "EcalBarrel",
-                                "TOWER",
-                                "HGCalEESensitive",
-                                "HGCalHESiliconSensitive",
-                                "HGCalHEScintillatorSensitive"
-    )
-)
-from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
-from Geometry.HcalEventSetup.HcalGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
-from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
-from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
-from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
-from Geometry.EcalMapping.EcalMapping_cfi import *
-from Geometry.EcalMapping.EcalMappingRecord_cfi import *
-
-# muon
-from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
-from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
-from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
-from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
-
-# forward
-from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
-
-# timing
-from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
-from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
-from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
-from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
-mtdGeometry.applyAlignment = cms.bool(False)
-
diff --git a/Configuration/Geometry/python/GeometryExtended2026D55_cff.py b/Configuration/Geometry/python/GeometryExtended2026D55_cff.py
deleted file mode 100644
index 00fed593c7dea..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2026D55_cff.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Geometry.CMSCommonData.cmsExtendedGeometry2026D55XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
-from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
-from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
-from Geometry.MuonNumbering.muonGeometryConstants_cff import *
-from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D47Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D60Reco_cff.py
similarity index 97%
rename from Configuration/Geometry/python/GeometryExtended2026D47Reco_cff.py
rename to Configuration/Geometry/python/GeometryExtended2026D60Reco_cff.py
index 7fca7459038ad..25d2ce546a985 100644
--- a/Configuration/Geometry/python/GeometryExtended2026D47Reco_cff.py
+++ b/Configuration/Geometry/python/GeometryExtended2026D60Reco_cff.py
@@ -3,7 +3,7 @@
 # This config was generated automatically using generate2026Geometry.py
 # If you notice a mistake, please update the generating script, not just this config
 
-from Configuration.Geometry.GeometryExtended2026D47_cff import *
+from Configuration.Geometry.GeometryExtended2026D60_cff import *
 
 # tracker
 from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D44_cff.py b/Configuration/Geometry/python/GeometryExtended2026D60_cff.py
similarity index 93%
rename from Configuration/Geometry/python/GeometryExtended2026D44_cff.py
rename to Configuration/Geometry/python/GeometryExtended2026D60_cff.py
index 9832765270ea4..ec0fa392a8b04 100644
--- a/Configuration/Geometry/python/GeometryExtended2026D44_cff.py
+++ b/Configuration/Geometry/python/GeometryExtended2026D60_cff.py
@@ -3,7 +3,7 @@
 # This config was generated automatically using generate2026Geometry.py
 # If you notice a mistake, please update the generating script, not just this config
 
-from Geometry.CMSCommonData.cmsExtendedGeometry2026D44XML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2026D60XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D45Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D61Reco_cff.py
similarity index 97%
rename from Configuration/Geometry/python/GeometryExtended2026D45Reco_cff.py
rename to Configuration/Geometry/python/GeometryExtended2026D61Reco_cff.py
index 4ffbbf8d43fb2..2a94f1b2a053e 100644
--- a/Configuration/Geometry/python/GeometryExtended2026D45Reco_cff.py
+++ b/Configuration/Geometry/python/GeometryExtended2026D61Reco_cff.py
@@ -3,7 +3,7 @@
 # This config was generated automatically using generate2026Geometry.py
 # If you notice a mistake, please update the generating script, not just this config
 
-from Configuration.Geometry.GeometryExtended2026D45_cff import *
+from Configuration.Geometry.GeometryExtended2026D61_cff import *
 
 # tracker
 from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2026D45_cff.py b/Configuration/Geometry/python/GeometryExtended2026D61_cff.py
similarity index 92%
rename from Configuration/Geometry/python/GeometryExtended2026D45_cff.py
rename to Configuration/Geometry/python/GeometryExtended2026D61_cff.py
index 73855170aa18a..22efa9cef7f74 100644
--- a/Configuration/Geometry/python/GeometryExtended2026D45_cff.py
+++ b/Configuration/Geometry/python/GeometryExtended2026D61_cff.py
@@ -3,7 +3,7 @@
 # This config was generated automatically using generate2026Geometry.py
 # If you notice a mistake, please update the generating script, not just this config
 
-from Geometry.CMSCommonData.cmsExtendedGeometry2026D45XML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2026D61XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
 from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
index ef769b8d4d343..f60dd3bd3ec2d 100644
--- a/Configuration/Geometry/python/dict2026Geometry.py
+++ b/Configuration/Geometry/python/dict2026Geometry.py
@@ -3,61 +3,7 @@
 commonDict = {
     "abbrev" : "O",
     "name" : "common",
-    "default" : 2,
-    "O2" : {
-        1 : [
-            'Geometry/CMSCommonData/data/materials.xml',
-            'Geometry/CMSCommonData/data/rotations.xml',
-            'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-            'Geometry/CMSCommonData/data/cms/2026/v1/cms.xml',
-            'Geometry/CMSCommonData/data/eta3/etaMax.xml',        
-            'Geometry/CMSCommonData/data/cmsMother.xml',
-            'Geometry/CMSCommonData/data/cmsTracker.xml',
-            'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
-            'Geometry/CMSCommonData/data/cmsCalo.xml',
-            'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
-            'Geometry/CMSCommonData/data/cmsMuon.xml',
-            'Geometry/CMSCommonData/data/mgnt.xml',
-            'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-            'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
-            'Geometry/CMSCommonData/data/muonMB.xml',
-            'Geometry/CMSCommonData/data/muonMagnet.xml',
-            'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-            'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-            'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        ],
-        5 : [
-            'Geometry/CMSCommonData/data/FieldParameters.xml',
-        ],
-        "era" : "phase2_common, phase2_trigger",
-    },
-    "O3" : {
-        1 : [
-            'Geometry/CMSCommonData/data/materials.xml',
-            'Geometry/CMSCommonData/data/rotations.xml',
-            'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-            'Geometry/CMSCommonData/data/cms/2026/v2/cms.xml',
-            'Geometry/CMSCommonData/data/eta3/etaMax.xml',        
-            'Geometry/CMSCommonData/data/cmsMother.xml',
-            'Geometry/CMSCommonData/data/cmsTracker.xml',
-            'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
-            'Geometry/CMSCommonData/data/cmsCalo.xml',
-            'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
-            'Geometry/CMSCommonData/data/cmsMuon.xml',
-            'Geometry/CMSCommonData/data/mgnt.xml',
-            'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-            'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
-            'Geometry/CMSCommonData/data/muonMB.xml',
-            'Geometry/CMSCommonData/data/muonMagnet.xml',
-            'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-            'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-            'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        ],
-        5 : [
-            'Geometry/CMSCommonData/data/FieldParameters.xml',
-        ],
-        "era" : "phase2_common, phase2_trigger",
-    },
+    "default" : 4,
     "O4" : {
         1 : [
             'Geometry/CMSCommonData/data/materials.xml',
@@ -144,111 +90,7 @@
 trackerDict = {
     "abbrev" : "T",
     "name" : "tracker",
-    "default" : 5,
-    "T5" : {
-        1 : [
-            'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-            'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixfwd.xml', 
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixbar.xml', 
-            'Geometry/TrackerCommonData/data/trackermaterial.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/tracker.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixel.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerbar.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerfwd.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerStructureTopology.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixelStructureTopology.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackersens.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelsens.xml',
-            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4025/trackerRecoMaterial.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackerProdCuts.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelProdCuts.xml',
-            'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        ],
-        "sim" : [
-            'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
-            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT5_cff import *',
-        ],
-        "reco" : [
-            'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *',
-            'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *',
-            'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
-        ],
-        "era" : "phase2_tracker, trackingPhase2PU140",
-    },
-    "T6" : {
-        1 : [
-            'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-            'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml', 
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', 
-            'Geometry/TrackerCommonData/data/trackermaterial.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-            'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        ],
-        "sim" : [
-            'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
-            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *',
-        ],
-        "reco" : [
-            'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *',
-            'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *',
-            'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
-        ],
-        "era" : "phase2_tracker, trackingPhase2PU140",
-    },
-    "T14" : {
-        1 : [
-            'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-            'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml', 
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', 
-            'Geometry/TrackerCommonData/data/trackermaterial.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-            'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        ],
-        "sim" : [
-            'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
-            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *',
-        ],
-        "reco" : [
-            'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *',
-            'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *',
-            'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
-        ],
-        "era" : "phase2_tracker, trackingPhase2PU140",
-    },
+    "default" : 15,
     "T15" : {
         1 : [
             'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
@@ -284,41 +126,6 @@
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
     },
-    "T16" : {
-        1 : [
-            'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-            'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
-            'Geometry/TrackerCommonData/data/trackermaterial.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/Tracker_Skewed_IT_2019_08/pixel.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-            'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        ],
-        "sim" : [
-            'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
-            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *',
-        ],
-        "reco" : [
-            'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *',
-            'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *',
-            'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
-        ],
-        "era" : "phase2_tracker, trackingPhase2PU140",
-    },
    "T17" : {
         1 : [
             'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
@@ -429,240 +236,7 @@
 caloDict = {
     "abbrev" : "C",
     "name" : "calo",
-    "default" : 4,
-    "C4" : {
-        1 : [
-            'Geometry/EcalCommonData/data/ectkcable.xml',
-            'Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ebalgo.xml',
-            'Geometry/EcalCommonData/data/ebcon.xml',
-            'Geometry/EcalCommonData/data/ebrot.xml',
-            'Geometry/EcalCommonData/data/eecon.xml',
-            'Geometry/EcalCommonData/data/escon/2026/v1/escon.xml',
-            'Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml',
-            'Geometry/HcalCommonData/data/hcalrotations.xml',
-            'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml',
-            'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-            'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-            'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-            'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-            'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-            'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
-            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-            'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
-            'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
-            'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
-            'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
-        ],
-        3 : [
-            'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-            'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-            'Geometry/HcalSimData/data/hf.xml',
-            'Geometry/HcalSimData/data/hfpmt.xml',
-            'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HGCalSimData/data/CaloUtil.xml',
-            'Geometry/HGCalSimData/data/hgcsensv9.xml',
-        ],
-        4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts.xml',
-            'Geometry/EcalSimData/data/EcalProdCuts.xml',
-            'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
-        ],
-        "sim" : [
-            'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *',
-            'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *',
-            'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *',
-            'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *'
-        ],
-        "reco" : [
-            'from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *',
-            'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *',
-            'from Geometry.CaloEventSetup.CaloTopology_cfi import *',
-            'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *',
-            'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",',
-            '    SelectedCalos = cms.vstring("HCAL",',
-            '                                "ZDC",',
-            '                                "EcalBarrel",',
-            '                                "TOWER",',
-            '                                "HGCalEESensitive",',
-            '                                "HGCalHESiliconSensitive",',
-            '                                "HGCalHEScintillatorSensitive"',
-            '    )',
-            ')',
-            'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *',
-            'from Geometry.HcalEventSetup.HcalGeometry_cfi import *',
-            'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *',
-            'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *',
-            'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *',
-            'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *',
-            'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *',
-            'from Geometry.EcalMapping.EcalMapping_cfi import *',
-            'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
-        ],
-        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions",
-    },
-    "C6" : {
-        1 : [
-            'Geometry/EcalCommonData/data/ectkcable.xml',
-            'Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ebalgo.xml',
-            'Geometry/EcalCommonData/data/ebcon.xml',
-            'Geometry/EcalCommonData/data/ebrot.xml',
-            'Geometry/EcalCommonData/data/eecon.xml',
-            'Geometry/EcalCommonData/data/escon/2026/v1/escon.xml',
-            'Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml',
-            'Geometry/HcalCommonData/data/hcalrotations.xml',
-            'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml',
-            'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-            'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-            'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-            'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-            'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-            'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
-            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-            'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
-            'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
-            'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
-            'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
-            'Geometry/ForwardCommonData/data/hfnose/v1a/hfnose.xml',
-            'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml',
-            'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
-            'Geometry/ForwardCommonData/data/hfnoseLayer/v1/hfnoseLayer.xml',
-            'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml',
-        ],
-        3 : [
-            'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-            'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-            'Geometry/HcalSimData/data/hf.xml',
-            'Geometry/HcalSimData/data/hfpmt.xml',
-            'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HGCalSimData/data/CaloUtil.xml',
-            'Geometry/HGCalSimData/data/hgcsensv9.xml',
-            'Geometry/ForwardSimData/data/hfnosesens.xml',
-        ],
-        4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts.xml',
-            'Geometry/EcalSimData/data/EcalProdCuts.xml',
-            'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
-            'Geometry/ForwardSimData/data/hfnoseProdCuts.xml',
-        ],
-        "sim" : [
-            'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *',
-            'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *',
-            'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *',
-            'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *',
-            'from Geometry.ForwardCommonData.hfnoseParametersInitialization_cfi import *',
-            'from Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi  import *',
-        ],
-        "reco" : [
-            'from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *',
-            'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *',
-            'from Geometry.CaloEventSetup.HFNoseTopology_cfi import *',
-            'from Geometry.ForwardGeometry.HFNoseGeometryESProducer_cfi import *',
-            'from Geometry.CaloEventSetup.CaloTopology_cfi import *',
-            'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *',
-            'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",',
-            '    SelectedCalos = cms.vstring("HCAL",',
-            '                                "ZDC",',
-            '                                "EcalBarrel",',
-            '                                "TOWER",',
-            '                                "HGCalEESensitive",',
-            '                                "HGCalHESiliconSensitive",',
-            '                                "HGCalHEScintillatorSensitive",',
-            '                                "HGCalHFNoseSensitive",',
-            '    )',
-            ')',
-            'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *',
-            'from Geometry.HcalEventSetup.HcalGeometry_cfi import *',
-            'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *',
-            'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *',
-            'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *',
-            'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *',
-            'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *',
-            'from Geometry.EcalMapping.EcalMapping_cfi import *',
-            'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
-        ],
-        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, phase2_hfnose",
-    },
-    "C8" : {
-        1 : [
-            'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-            'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-            'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
-            'Geometry/EcalCommonData/data/ebalgo.xml',
-            'Geometry/EcalCommonData/data/ebcon.xml',
-            'Geometry/EcalCommonData/data/ebrot.xml',
-            'Geometry/HcalCommonData/data/hcalrotations.xml',
-            'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
-            'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-            'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
-            'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-            'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-            'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-            'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-            'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-            'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-            'Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml',
-            'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-            'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-            'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
-            'Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml',
-            'Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml',
-            'Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml',
-        ],
-        3 : [
-            'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-            'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-            'Geometry/HcalSimData/data/hf.xml',
-            'Geometry/HcalSimData/data/hfpmt.xml',
-            'Geometry/HcalSimData/data/hffibrebundle.xml',
-            'Geometry/HcalSimData/data/CaloUtil.xml',
-            'Geometry/HGCalSimData/data/hgcsensv9.xml',
-        ],
-        4 : [
-            'Geometry/HcalSimData/data/HcalProdCuts.xml',
-            'Geometry/EcalSimData/data/EcalProdCuts.xml',
-            'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
-        ],
-        "sim" : [
-            'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *',
-            'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *',
-            'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *',
-            'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *'
-        ],
-        "reco" : [
-            'from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *',
-            'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *',
-            'from Geometry.CaloEventSetup.CaloTopology_cfi import *',
-            'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *',
-            'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",',
-            '    SelectedCalos = cms.vstring("HCAL",',
-            '                                "ZDC",',
-            '                                "EcalBarrel",',
-            '                                "TOWER",',
-            '                                "HGCalEESensitive",',
-            '                                "HGCalHESiliconSensitive",',
-            '                                "HGCalHEScintillatorSensitive"',
-            '    )',
-            ')',
-            'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *',
-            'from Geometry.HcalEventSetup.HcalGeometry_cfi import *',
-            'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *',
-            'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *',
-            'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *',
-            'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *',
-            'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *',
-            'from Geometry.EcalMapping.EcalMapping_cfi import *',
-            'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
-        ],
-        "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, phase2_hgcalV9, hcalHardcodeConditions, phase2_hgcalV10",
-    },
+    "default" : 9,
     "C9" : {
         1 : [
             'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
@@ -1059,97 +633,7 @@
 muonDict = {
     "abbrev" : "M",
     "name" : "muon",
-    "default" : 2,
-    "M2" : {
-        1 : [
-            'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-            'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-            'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-            'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-            'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-            'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-            'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-            'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-            'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-            'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-            'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-            'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-            'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-            'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        ],
-        2 : [
-            'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        ],
-        3 : [
-            'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
-            'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-            'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-            'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-            'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml',
-            'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-            'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        ],
-        4 : [
-            'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        ],
-        "sim" : [
-            'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
-        ],
-        "reco" : [
-            'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
-            'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
-            'from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *',
-            'from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *',
-            'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
-            'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
-        ],
-        "era" : "phase2_muon, phase2_GEM",
-    },
-    "M3" : {
-        1 : [
-            'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-            'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-            'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-            'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-            'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-            'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-            'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-            'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-            'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-            'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-            'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-            'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-            'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-            'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        ],
-        2 : [
-            'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        ],
-        3 : [
-            'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
-            'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-            'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-            'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-            'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
-            'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-            'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        ],
-        4 : [
-            'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        ],
-        "sim" : [
-            'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
-        ],
-        "reco" : [
-            'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *',
-            'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *',
-            'from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *',
-            'from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *',
-            'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *',
-            'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *',
-        ],
-        "era" : "phase2_muon, phase2_GEM",
-    },
+    "default" : 4,
     "M4" : {
         1 : [
             'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
@@ -1474,91 +958,7 @@
 timingDict = {
     "abbrev" : "I",
     "name" : "timing",
-    "default" : 5,
-    "I5" : {
-        1 : [
-            'Geometry/MTDCommonData/data/btl.xml',
-            'Geometry/MTDCommonData/data/etl.xml',
-            'Geometry/MTDCommonData/data/CrystalBarZflat/mtd.xml',
-            'Geometry/MTDCommonData/data/CrystalBarZflat/mtdStructureTopology.xml',
-            'Geometry/MTDCommonData/data/CrystalBarZflat/mtdParameters.xml',
-            ],
-        3 : [
-            'Geometry/MTDSimData/data/CrystalBarZflat/mtdsens.xml'
-            ],
-        4 : [
-            'Geometry/MTDSimData/data/CrystalBarZflat/mtdProdCuts.xml'
-            ],
-        "sim" : [
-            'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *',
-        ],
-        "reco" :[
-            'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *',
-            'from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *',
-            'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *',
-            'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *',
-            'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *',
-            'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
-            'mtdGeometry.applyAlignment = cms.bool(False)'
-        ],
-        "era" : "phase2_timing, phase2_timing_layer",
-    },
-    "I7" : {
-        1 : [
-            'Geometry/MTDCommonData/data/btl.xml',
-            'Geometry/MTDCommonData/data/etl.xml',
-            'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtd.xml',
-            'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
-            'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
-            ],
-        3 : [
-            'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml'
-            ],
-        4 : [
-            'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml'
-            ],
-        "sim" : [
-            'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *',
-        ],
-        "reco" :[
-            'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *',
-            'from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *',
-            'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *',
-            'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *',
-            'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *',
-            'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
-            'mtdGeometry.applyAlignment = cms.bool(False)'
-        ],
-        "era" : "phase2_timing, phase2_timing_layer",
-    },
-    "I9" : {
-        1 : [
-            'Geometry/MTDCommonData/data/btl.xml',
-            'Geometry/MTDCommonData/data/etl/v2/etl.xml',
-            'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v2/mtd.xml',
-            'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
-            'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
-            ],
-        3 : [
-            'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml'
-            ],
-        4 : [
-            'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml'
-            ],
-        "sim" : [
-            'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *',
-        ],
-        "reco" :[
-            'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *',
-            'from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *',
-            'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *',
-            'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *',
-            'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *',
-            'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
-            'mtdGeometry.applyAlignment = cms.bool(False)'
-        ],
-        "era" : "phase2_timing, phase2_timing_layer",
-    },
+    "default" : 10,
     "I10" : {
         1 : [
             'Geometry/MTDCommonData/data/btl.xml',
@@ -1648,25 +1048,18 @@
 allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, timingDict ]
 
 detectorVersionDict = {
-    ("O2","T6","C4","M2","F2","I5") : "D35",
-    ("O3","T14","C8","M3","F2","I9") : "D41",
-    ("O2","T14","C4","M3","F2","I7") : "D43",
-    ("O2","T14","C6","M3","F3","I7") : "D44",
-    ("O3","T15","C8","M3","F2","I10") : "D45",
-    ("O3","T15","C9","M3","F2","I10") : "D46",
-    ("O3","T15","C10","M3","F3","I10") : "D47",
-    ("O3","T16","C9","M3","F2","I10") : "D48",
     ("O4","T15","C9","M4","F2","I10") : "D49",
     ("O4","T15","C9","M4","F2","I11") : "D50",
     ("O4","T17","C9","M4","F2","I10") : "D51",
     ("O4","T15","C9","M4","F2","I12") : "D53",
     ("O4","T19","C9","M4","F2","I10") : "D54",
-    ("O4","T19","C9","M5","F2","I10") : "D55",
     ("O4","T20","C9","M4","F2","I10") : "D56",
     ("O5","T17","C11","M6","F4","I11") : "D57",
     ("O5","T17","C12","M6","F5","I11") : "D58",
     ("O6","T17","C13","M7","F6","I11") : "D59",
+    ("O4","T15","C10","M4","F3","I10") : "D60",
+    ("O4","T17","C9","M5","F2","I10") : "D61",
  }
 
-deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D52" ])
-deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T7", "T8", "T9", "T10", "T11", "T12", "T13", "T18", "C1", "C2", "C3", "C5", "C7", "M1", "I1", "I2", "I3", "I4", "I6", "I8", "O1", "F1" ])
+deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D52", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D55" ])
+deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T7", "T8", "T9", "T10", "T11", "T12", "T13", "T18", "C1", "C2", "C3", "C5", "C7", "M1", "I1", "I2", "I3", "I4", "I6", "I8", "O1", "F1", "T5" ,"T6", "T14", "T16", "C4", "C6", "C8", "M2", "M3", "I5", "I7", "I9", "O2", "O3" ])
diff --git a/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py b/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py
index 778f37079f44b..7d349097b13cf 100644
--- a/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py
+++ b/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py
@@ -1,3 +1,3 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.Geometry.GeometryDD4hepExtended2026D41_cff import *
+from Configuration.Geometry.GeometryDD4hepExtended2026D49_cff import *
diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py
index 082078977c960..dd53ff0f6d8c5 100644
--- a/Configuration/StandardSequences/python/GeometryConf.py
+++ b/Configuration/StandardSequences/python/GeometryConf.py
@@ -29,22 +29,15 @@
     'ECALHCAL'    : 'Configuration.Geometry.GeometrySimECALHCAL_cff,Configuration.Geometry.GeometryRecoECALHCAL_cff',
     'TrackerOnly' : 'Configuration.Geometry.GeometrySimTracker_cff,Configuration.Geometry.GeometryRecoTracker_cff',
     'HCal'        : 'Configuration.Geometry.GeometrySimHCAL_cff,Configuration.Geometry.GeometryRecoHCAL_cff',
-    'Extended2026D35' : 'Extended2026D35,Extended2026D35Reco',
-    'Extended2026D41' : 'Extended2026D41,Extended2026D41Reco',
-    'Extended2026D43' : 'Extended2026D43,Extended2026D43Reco',
-    'Extended2026D44' : 'Extended2026D44,Extended2026D44Reco',
-    'Extended2026D45' : 'Extended2026D45,Extended2026D45Reco',
-    'Extended2026D46' : 'Extended2026D46,Extended2026D46Reco',
-    'Extended2026D47' : 'Extended2026D47,Extended2026D47Reco',
-    'Extended2026D48' : 'Extended2026D48,Extended2026D48Reco',
     'Extended2026D49' : 'Extended2026D49,Extended2026D49Reco',
     'Extended2026D50' : 'Extended2026D50,Extended2026D50Reco',
     'Extended2026D51' : 'Extended2026D51,Extended2026D51Reco',
     'Extended2026D53' : 'Extended2026D53,Extended2026D53Reco',
     'Extended2026D54' : 'Extended2026D54,Extended2026D54Reco',
-    'Extended2026D55' : 'Extended2026D55,Extended2026D55Reco',
     'Extended2026D56' : 'Extended2026D56,Extended2026D56Reco',
     'Extended2026D57' : 'Extended2026D57,Extended2026D57Reco',
     'Extended2026D58' : 'Extended2026D58,Extended2026D58Reco',
     'Extended2026D59' : 'Extended2026D59,Extended2026D59Reco',
+    'Extended2026D60' : 'Extended2026D60,Extended2026D60Reco',
+    'Extended2026D61' : 'Extended2026D61,Extended2026D61Reco',
     }
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D35.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D35.xml
deleted file mode 100644
index 52eaa3881d51f..0000000000000
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D35.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-<DDDefinition>
-  <open_geometry/>
-  <close_geometry/>
-
-  <IncludeSection>
-    <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v1/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/escon/2026/v1/escon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2015/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/PostLS2/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/btl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/etl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarZflat/mtd.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarZflat/mtdStructureTopology.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarZflat/mtdParameters.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml'/>
-    <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/CaloUtil.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcsensv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
-    <Include ref='Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarZflat/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
-    <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarZflat/mtdProdCuts.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
-  </IncludeSection>
-</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D41.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D41.xml
deleted file mode 100644
index d03e5e816b5c2..0000000000000
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D41.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<DDDefinition>
-  <open_geometry/>
-  <close_geometry/>
-
-  <IncludeSection>
-    <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v2/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2015/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/PostLS2/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/btl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/etl/v2/etl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/v2/mtd.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml'/>
-    <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcsensv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
-    <Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
-    <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
-  </IncludeSection>
-</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D43.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D43.xml
deleted file mode 100644
index d27f22760dd11..0000000000000
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D43.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-<DDDefinition>
-  <open_geometry/>
-  <close_geometry/>
-
-  <IncludeSection>
-    <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v1/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/escon/2026/v1/escon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2015/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/PostLS2/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/btl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/etl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtd.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml'/>
-    <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/CaloUtil.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcsensv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
-    <Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
-    <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
-  </IncludeSection>
-</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D44.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D44.xml
deleted file mode 100644
index 30770072d2449..0000000000000
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D44.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-<DDDefinition>
-  <open_geometry/>
-  <close_geometry/>
-
-  <IncludeSection>
-    <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v1/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eecon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/escon/2026/v1/escon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/hfnose/v1a/hfnose.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/hfnoseLayer/v1/hfnoseLayer.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2015/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v1/forwardshield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brm/2026/v2/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/btl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/etl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtd.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml'/>
-    <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/CaloUtil.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcsensv9.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/hfnosesens.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
-    <Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
-    <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv9.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/hfnoseProdCuts.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
-  </IncludeSection>
-</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D45.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D45.xml
deleted file mode 100644
index 2a60418e6fc84..0000000000000
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D45.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<DDDefinition>
-  <open_geometry/>
-  <close_geometry/>
-
-  <IncludeSection>
-    <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v2/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2015/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/PostLS2/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/btl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/etl/v2/etl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml'/>
-    <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcsensv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
-    <Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
-    <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
-  </IncludeSection>
-</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D45NoSD.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D45NoSD.xml
deleted file mode 100644
index 6741d610f6b32..0000000000000
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D45NoSD.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-<DDDefinition>
-  <open_geometry/>
-  <close_geometry/>
-
-  <IncludeSection>
-    <Include ref="Geometry/CMSCommonData/data/materials.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cms/2026/v2/cms.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cmsTracker.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cmsMuon.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/mgnt.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/muonMB.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/muonMagnet.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/pixfwdCommon.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/trackermaterial.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml"/>
-    <Include ref="Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml"/>
-    <Include ref="Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml"/>
-    <Include ref="Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml"/>
-    <Include ref="Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml"/>
-    <Include ref="Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml"/>
-    <Include ref="Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml"/>
-    <Include ref="Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml"/>
-    <Include ref="Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml"/>
-    <Include ref="Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml"/>
-    <Include ref="Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml"/>
-    <Include ref="Geometry/EcalCommonData/data/ebalgo.xml"/>
-    <Include ref="Geometry/EcalCommonData/data/ebcon.xml"/>
-    <Include ref="Geometry/EcalCommonData/data/ebrot.xml"/>
-    <Include ref="Geometry/HcalCommonData/data/hcalrotations.xml"/>
-    <Include ref="Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml"/>
-    <Include ref="Geometry/HcalCommonData/data/hcalbarrelalgo.xml"/>
-    <Include ref="Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml"/>
-    <Include ref="Geometry/HcalCommonData/data/hcalouteralgo.xml"/>
-    <Include ref="Geometry/HcalCommonData/data/hcalforwardalgo.xml"/>
-    <Include ref="Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml"/>
-    <Include ref="Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml"/>
-    <Include ref="Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml"/>
-    <Include ref="Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/mf/2026/v2/mf.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/csc/2015/v1/csc.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/brmrotations.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/PostLS2/brm.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/zdcmaterials.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/lumimaterials.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/zdcrotations.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/lumirotations.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/zdc.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/zdclumi.xml"/>
-    <Include ref="Geometry/ForwardCommonData/data/cmszdc.xml"/>
-    <Include ref="Geometry/MTDCommonData/data/btl.xml"/>
-    <Include ref="Geometry/MTDCommonData/data/etl/v2/etl.xml"/>
-    <Include ref="Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml"/>
-    <Include ref="Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml"/>
-    <Include ref="Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml"/>
-    <Include ref="Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml"/>
-    <Include ref="Geometry/HcalSimData/data/hf.xml"/>
-    <Include ref="Geometry/HcalSimData/data/hfpmt.xml"/>
-    <Include ref="Geometry/HcalSimData/data/hffibrebundle.xml"/>
-    <Include ref="Geometry/HcalSimData/data/CaloUtil.xml"/>
-    <Include ref="Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml"/>
-    <Include ref="Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml"/>
-    <Include ref="Geometry/CSCGeometryBuilder/data/cscSpecs.xml"/>
-    <Include ref="Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml"/>
-    <Include ref="Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml"/>
-    <Include ref="Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/cmsProdCuts.xml"/>
-    <Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/>
-  </IncludeSection>
-  
-</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D46.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D46.xml
deleted file mode 100644
index 66d5d31a66a34..0000000000000
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D46.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<DDDefinition>
-  <open_geometry/>
-  <close_geometry/>
-
-  <IncludeSection>
-    <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v2/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2015/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/PostLS2/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/btl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/etl/v2/etl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml'/>
-    <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcsensv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
-    <Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
-    <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
-  </IncludeSection>
-</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D48.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D48.xml
deleted file mode 100644
index 1a0e3701d418f..0000000000000
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D48.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0"?>
-<DDDefinition>
-  <open_geometry/>
-  <close_geometry/>
-
-  <IncludeSection>
-    <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v2/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/Tracker_Skewed_IT_2019_08/pixel.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebalgo.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebcon.xml'/>
-    <Include ref='Geometry/EcalCommonData/data/ebrot.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalrotations.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalbarrelalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml'/>
-    <Include ref='Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2015/v1/csc.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/PostLS2/brm.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcmaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdc.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/zdclumi.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/btl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/etl/v2/etl.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml'/>
-    <Include ref='Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml'/>
-    <Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
-    <Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hf.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
-    <Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
-    <Include ref='Geometry/HcalSimData/data/CaloUtil.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcsensv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
-    <Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
-    <Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml'/>
-    <Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml'/>
-    <Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml'/>
-    <Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
-    <Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
-    <Include ref='Geometry/HGCalSimData/data/hgcProdCutsv9.xml'/>
-    <Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/zdcProdCuts.xml'/>
-    <Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
-    <Include ref='Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
-  </IncludeSection>
-</DDDefinition>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D47.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D60.xml
similarity index 90%
rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D47.xml
rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D60.xml
index db82e96da8bb6..178662d62ba1a 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D47.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D60.xml
@@ -7,22 +7,22 @@
     <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
     <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
     <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cms/2026/v2/cms.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
     <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
     <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
     <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml'/>
-    <Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
     <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml'/>
@@ -69,20 +69,21 @@
     <Include ref='Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/hfnoseLayer/v1/hfnoseLayer.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mf/2026/v2/mf.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
     <Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/csc/2015/v1/csc.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml'/>
-    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml'/>
+    <Include ref='Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/forwardshield/2026/v1/forwardshield.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
     <Include ref='Geometry/ForwardCommonData/data/brm/2026/v2/brm.xml'/>
diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D55.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D61.xml
similarity index 98%
rename from Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D55.xml
rename to Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D61.xml
index c78f4d8c6d76e..575eec36effc1 100644
--- a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D55.xml
+++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D61.xml
@@ -30,16 +30,16 @@
     <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker700/pixel.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker615/pixel.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml'/>
     <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml'/>
-    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker700/pixelStructureTopology.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelsens.xml'/>
-    <Include ref='Geometry/TrackerRecoData/data/PhaseII/TiltedTracker700/trackerRecoMaterial.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml'/>
+    <Include ref='Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml'/>
     <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml'/>
-    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelProdCuts.xml'/>
+    <Include ref='Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml'/>
     <Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
     <Include ref='Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml'/>
     <Include ref='Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml'/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D35XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D35XML_cfi.py
deleted file mode 100644
index be326b1ef1030..0000000000000
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D35XML_cfi.py
+++ /dev/null
@@ -1,128 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring(
-        'Geometry/CMSCommonData/data/materials.xml',
-        'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v1/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
-        'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
-        'Geometry/CMSCommonData/data/cmsMuon.xml',
-        'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
-        'Geometry/CMSCommonData/data/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker404/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/ectkcable.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
-        'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/EcalCommonData/data/eecon.xml',
-        'Geometry/EcalCommonData/data/escon/2026/v1/escon.xml',
-        'Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml',
-        'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
-        'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
-        'Geometry/ForwardCommonData/data/lumimaterials.xml',
-        'Geometry/ForwardCommonData/data/zdcrotations.xml',
-        'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
-        'Geometry/ForwardCommonData/data/cmszdc.xml',
-        'Geometry/MTDCommonData/data/btl.xml',
-        'Geometry/MTDCommonData/data/etl.xml',
-        'Geometry/MTDCommonData/data/CrystalBarZflat/mtd.xml',
-        'Geometry/MTDCommonData/data/CrystalBarZflat/mtdStructureTopology.xml',
-        'Geometry/MTDCommonData/data/CrystalBarZflat/mtdParameters.xml',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-        'Geometry/HcalSimData/data/hf.xml',
-        'Geometry/HcalSimData/data/hfpmt.xml',
-        'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HGCalSimData/data/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsensv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/ForwardCommonData/data/brmsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/MTDSimData/data/CrystalBarZflat/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts.xml',
-        'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
-        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/MTDSimData/data/CrystalBarZflat/mtdProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D41XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D41XML_cfi.py
deleted file mode 100644
index d93a9c104b5a4..0000000000000
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D41XML_cfi.py
+++ /dev/null
@@ -1,127 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring(
-        'Geometry/CMSCommonData/data/materials.xml',
-        'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v2/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
-        'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
-        'Geometry/CMSCommonData/data/cmsMuon.xml',
-        'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
-        'Geometry/CMSCommonData/data/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
-        'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
-        'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
-        'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
-        'Geometry/ForwardCommonData/data/lumimaterials.xml',
-        'Geometry/ForwardCommonData/data/zdcrotations.xml',
-        'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
-        'Geometry/ForwardCommonData/data/cmszdc.xml',
-        'Geometry/MTDCommonData/data/btl.xml',
-        'Geometry/MTDCommonData/data/etl/v2/etl.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v2/mtd.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-        'Geometry/HcalSimData/data/hf.xml',
-        'Geometry/HcalSimData/data/hfpmt.xml',
-        'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsensv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/ForwardCommonData/data/brmsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts.xml',
-        'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
-        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D43XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D43XML_cfi.py
deleted file mode 100644
index def6a371cf25e..0000000000000
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D43XML_cfi.py
+++ /dev/null
@@ -1,128 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring(
-        'Geometry/CMSCommonData/data/materials.xml',
-        'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v1/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
-        'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
-        'Geometry/CMSCommonData/data/cmsMuon.xml',
-        'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
-        'Geometry/CMSCommonData/data/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/ectkcable.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
-        'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/EcalCommonData/data/eecon.xml',
-        'Geometry/EcalCommonData/data/escon/2026/v1/escon.xml',
-        'Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml',
-        'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
-        'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
-        'Geometry/ForwardCommonData/data/lumimaterials.xml',
-        'Geometry/ForwardCommonData/data/zdcrotations.xml',
-        'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
-        'Geometry/ForwardCommonData/data/cmszdc.xml',
-        'Geometry/MTDCommonData/data/btl.xml',
-        'Geometry/MTDCommonData/data/etl.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtd.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-        'Geometry/HcalSimData/data/hf.xml',
-        'Geometry/HcalSimData/data/hfpmt.xml',
-        'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HGCalSimData/data/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsensv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/ForwardCommonData/data/brmsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts.xml',
-        'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
-        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D44XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D44XML_cfi.py
deleted file mode 100644
index 864a7ff385ccd..0000000000000
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D44XML_cfi.py
+++ /dev/null
@@ -1,135 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring(
-        'Geometry/CMSCommonData/data/materials.xml',
-        'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v1/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v1/caloBase.xml',
-        'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
-        'Geometry/CMSCommonData/data/cmsMuon.xml',
-        'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
-        'Geometry/CMSCommonData/data/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/ectkcable.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v1/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
-        'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/EcalCommonData/data/eecon.xml',
-        'Geometry/EcalCommonData/data/escon/2026/v1/escon.xml',
-        'Geometry/EcalCommonData/data/esalgo/2026/v1/esalgo.xml',
-        'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/hcal/NoHE/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v9/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v9/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v9/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEmix/v9/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v9/hgcalCons.xml',
-        'Geometry/ForwardCommonData/data/hfnose/v1a/hfnose.xml',
-        'Geometry/ForwardCommonData/data/hfnoseCell/v1/hfnoseCell.xml',
-        'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
-        'Geometry/ForwardCommonData/data/hfnoseLayer/v1/hfnoseLayer.xml',
-        'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2026/v1/forwardshield.xml',
-        'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/brm/2026/v2/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
-        'Geometry/ForwardCommonData/data/lumimaterials.xml',
-        'Geometry/ForwardCommonData/data/zdcrotations.xml',
-        'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
-        'Geometry/ForwardCommonData/data/cmszdc.xml',
-        'Geometry/MTDCommonData/data/btl.xml',
-        'Geometry/MTDCommonData/data/etl.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtd.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-        'Geometry/HcalSimData/data/hf.xml',
-        'Geometry/HcalSimData/data/hfpmt.xml',
-        'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HGCalSimData/data/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsensv9.xml',
-        'Geometry/ForwardSimData/data/hfnosesens.xml',
-        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/ForwardCommonData/data/brmsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts.xml',
-        'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
-        'Geometry/ForwardSimData/data/hfnoseProdCuts.xml',
-        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
-        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D45NoSDXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D45NoSDXML_cfi.py
deleted file mode 100644
index e91487e6c8135..0000000000000
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D45NoSDXML_cfi.py
+++ /dev/null
@@ -1,114 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring(
-        'Geometry/CMSCommonData/data/materials.xml',
-        'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v2/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
-        'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
-        'Geometry/CMSCommonData/data/cmsMuon.xml',
-        'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
-        'Geometry/CMSCommonData/data/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
-        'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
-        'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
-        'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
-        'Geometry/ForwardCommonData/data/lumimaterials.xml',
-        'Geometry/ForwardCommonData/data/zdcrotations.xml',
-        'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
-        'Geometry/ForwardCommonData/data/cmszdc.xml',
-        'Geometry/MTDCommonData/data/btl.xml',
-        'Geometry/MTDCommonData/data/etl/v2/etl.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        'Geometry/HcalSimData/data/hf.xml',
-        'Geometry/HcalSimData/data/hfpmt.xml',
-        'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/CMSCommonData/data/cmsProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D45XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D45XML_cfi.py
deleted file mode 100644
index bd8790b998c26..0000000000000
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D45XML_cfi.py
+++ /dev/null
@@ -1,127 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring(
-        'Geometry/CMSCommonData/data/materials.xml',
-        'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v2/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
-        'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
-        'Geometry/CMSCommonData/data/cmsMuon.xml',
-        'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
-        'Geometry/CMSCommonData/data/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
-        'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
-        'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
-        'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
-        'Geometry/ForwardCommonData/data/lumimaterials.xml',
-        'Geometry/ForwardCommonData/data/zdcrotations.xml',
-        'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
-        'Geometry/ForwardCommonData/data/cmszdc.xml',
-        'Geometry/MTDCommonData/data/btl.xml',
-        'Geometry/MTDCommonData/data/etl/v2/etl.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-        'Geometry/HcalSimData/data/hf.xml',
-        'Geometry/HcalSimData/data/hfpmt.xml',
-        'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsensv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/ForwardCommonData/data/brmsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts.xml',
-        'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
-        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D46XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D46XML_cfi.py
deleted file mode 100644
index b95b582025bf9..0000000000000
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D46XML_cfi.py
+++ /dev/null
@@ -1,127 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring(
-        'Geometry/CMSCommonData/data/materials.xml',
-        'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v2/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
-        'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
-        'Geometry/CMSCommonData/data/cmsMuon.xml',
-        'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
-        'Geometry/CMSCommonData/data/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
-        'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
-        'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
-        'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
-        'Geometry/ForwardCommonData/data/lumimaterials.xml',
-        'Geometry/ForwardCommonData/data/zdcrotations.xml',
-        'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
-        'Geometry/ForwardCommonData/data/cmszdc.xml',
-        'Geometry/MTDCommonData/data/btl.xml',
-        'Geometry/MTDCommonData/data/etl/v2/etl.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-        'Geometry/HcalSimData/data/hf.xml',
-        'Geometry/HcalSimData/data/hfpmt.xml',
-        'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsensv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/ForwardCommonData/data/brmsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts.xml',
-        'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
-        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D48XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D48XML_cfi.py
deleted file mode 100644
index f982ccaf4f494..0000000000000
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D48XML_cfi.py
+++ /dev/null
@@ -1,127 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2026Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring(
-        'Geometry/CMSCommonData/data/materials.xml',
-        'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v2/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
-        'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
-        'Geometry/CMSCommonData/data/cmsMuon.xml',
-        'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
-        'Geometry/CMSCommonData/data/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/Tracker_Skewed_IT_2019_08/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
-        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
-        'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
-        'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
-        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
-        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
-        'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
-        'Geometry/ForwardCommonData/data/lumimaterials.xml',
-        'Geometry/ForwardCommonData/data/zdcrotations.xml',
-        'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
-        'Geometry/ForwardCommonData/data/cmszdc.xml',
-        'Geometry/MTDCommonData/data/btl.xml',
-        'Geometry/MTDCommonData/data/etl/v2/etl.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/v3/mtd.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdStructureTopology.xml',
-        'Geometry/MTDCommonData/data/CrystalBarPhiFlat/mtdParameters.xml',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
-        'Geometry/HcalSimData/data/hf.xml',
-        'Geometry/HcalSimData/data/hfpmt.xml',
-        'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsensv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/ForwardCommonData/data/brmsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts.xml',
-        'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
-        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
-        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/MTDSimData/data/CrystalBarPhiFlat/mtdProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D47XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D60XML_cfi.py
similarity index 90%
rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D47XML_cfi.py
rename to Geometry/CMSCommonData/python/cmsExtendedGeometry2026D60XML_cfi.py
index cad0d06ef3ed4..b9ec900aecaf0 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D47XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D60XML_cfi.py
@@ -8,22 +8,22 @@
         'Geometry/CMSCommonData/data/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2026/v2/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
         'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
         'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
         'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
+        'Geometry/CMSCommonData/data/cms/2026/v3/cms.xml',
+        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
@@ -70,20 +70,21 @@
         'Geometry/ForwardCommonData/data/hfnoseWafer/v1/hfnoseWafer.xml',
         'Geometry/ForwardCommonData/data/hfnoseLayer/v1/hfnoseLayer.xml',
         'Geometry/ForwardCommonData/data/hfnoseCons/v1/hfnoseCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
+        'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
         'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
         'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2026/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
         'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
         'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
         'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
         'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
+        'Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml',
         'Geometry/ForwardCommonData/data/forwardshield/2026/v1/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/brm/2026/v2/brm.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D55XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D61XML_cfi.py
similarity index 94%
rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2026D55XML_cfi.py
rename to Geometry/CMSCommonData/python/cmsExtendedGeometry2026D61XML_cfi.py
index 349ba4f9e2930..82dec2c8fb866 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D55XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D61XML_cfi.py
@@ -31,16 +31,16 @@
         'Geometry/TrackerCommonData/data/trackermaterial.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker700/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker615/pixel.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker700/pixelStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker700/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker700/pixelProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
         'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',