diff --git a/compact/hcal/lfhcal_with_space_for_insert.xml b/compact/hcal/lfhcal_with_space_for_insert.xml
deleted file mode 100644
index 29c397bf00..0000000000
--- a/compact/hcal/lfhcal_with_space_for_insert.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<lccdd>
-
-  <info name="lfhcal_with_space_for_insert.xml"
-        title="EPIC LFHCAL with insert cutout"
-        author="@FriederikeBock"
-        url="https://github.com/FriederikeBock"
-        status="development"
-        version="1.0"
-  ><comment/></info>
-
-  <define>
-    <constant name="LFHCAL_with_space_for_insert" value="1"/>
-    <constant name="LFHCAL_without_space_for_insert" value="0"/>
-  </define>
-
-  <include ref="lfhcal.xml"/>
-
-</lccdd>
diff --git a/compact/hcal/lfhcal_without_space_for_insert.xml b/compact/hcal/lfhcal_without_space_for_insert.xml
deleted file mode 100644
index 0c0ee1a1cc..0000000000
--- a/compact/hcal/lfhcal_without_space_for_insert.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<lccdd>
-
-  <info name="lfhcal_without_space_for_insert.xml"
-        title="EPIC LFHCAL without insert cutout"
-        author="@FriederikeBock"
-        url="https://github.com/FriederikeBock"
-        status="development"
-        version="1.0"
-  ><comment/></info>
-
-  <define>
-    <constant name="LFHCAL_with_space_for_insert" value="0"/>
-    <constant name="LFHCAL_without_space_for_insert" value="1"/>
-  </define>
-
-  <include ref="lfhcal.xml"/>
-
-</lccdd>
diff --git a/configurations/calorimeters.yml b/configurations/calorimeters.yml
index f02337758a..8b995c2b2d 100644
--- a/configurations/calorimeters.yml
+++ b/configurations/calorimeters.yml
@@ -7,7 +7,7 @@ features:
     bic_default:
     backward_PbWO4:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     backward:
diff --git a/configurations/craterlake.yml b/configurations/craterlake.yml
index c31cb13186..4ef5afd70f 100644
--- a/configurations/craterlake.yml
+++ b/configurations/craterlake.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     barrel_flux_return:
diff --git a/configurations/craterlake_10x100.yml b/configurations/craterlake_10x100.yml
index 3e6f1ec6ec..0d38114930 100644
--- a/configurations/craterlake_10x100.yml
+++ b/configurations/craterlake_10x100.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     forward_endcap_flux:
     barrel_flux_return:
diff --git a/configurations/craterlake_10x100_Au197.yml b/configurations/craterlake_10x100_Au197.yml
index 3364254f9e..849116bb36 100644
--- a/configurations/craterlake_10x100_Au197.yml
+++ b/configurations/craterlake_10x100_Au197.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     forward_endcap_flux:
     barrel_flux_return:
diff --git a/configurations/craterlake_10x115_Cu63.yml b/configurations/craterlake_10x115_Cu63.yml
index 811c55b1bf..e095d218b7 100644
--- a/configurations/craterlake_10x115_Cu63.yml
+++ b/configurations/craterlake_10x115_Cu63.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     forward_endcap_flux:
     barrel_flux_return:
diff --git a/configurations/craterlake_10x115_Ru96.yml b/configurations/craterlake_10x115_Ru96.yml
index 8f1a2d47c0..0d7c92887c 100644
--- a/configurations/craterlake_10x115_Ru96.yml
+++ b/configurations/craterlake_10x115_Ru96.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     forward_endcap_flux:
     barrel_flux_return:
diff --git a/configurations/craterlake_10x130.yml b/configurations/craterlake_10x130.yml
index 8f2a716f2c..192693621a 100644
--- a/configurations/craterlake_10x130.yml
+++ b/configurations/craterlake_10x130.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     forward_endcap_flux:
     barrel_flux_return:
diff --git a/configurations/craterlake_10x130_H2.yml b/configurations/craterlake_10x130_H2.yml
index 199a7332b9..d230fbcd18 100644
--- a/configurations/craterlake_10x130_H2.yml
+++ b/configurations/craterlake_10x130_H2.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     forward_endcap_flux:
     barrel_flux_return:
diff --git a/configurations/craterlake_10x166_He3.yml b/configurations/craterlake_10x166_He3.yml
index 79bd1734e8..29f3f5bb00 100644
--- a/configurations/craterlake_10x166_He3.yml
+++ b/configurations/craterlake_10x166_He3.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     forward_endcap_flux:
     barrel_flux_return:
diff --git a/configurations/craterlake_10x250.yml b/configurations/craterlake_10x250.yml
index 36b141cc59..3ef406d945 100644
--- a/configurations/craterlake_10x250.yml
+++ b/configurations/craterlake_10x250.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     forward_endcap_flux:
     barrel_flux_return:
diff --git a/configurations/craterlake_10x275.yml b/configurations/craterlake_10x275.yml
index 021150e71f..ff02ea48cb 100644
--- a/configurations/craterlake_10x275.yml
+++ b/configurations/craterlake_10x275.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     barrel_flux_return:
diff --git a/configurations/craterlake_18x110_Au.yml b/configurations/craterlake_18x110_Au.yml
index 55963a6fec..a2ce78367f 100644
--- a/configurations/craterlake_18x110_Au.yml
+++ b/configurations/craterlake_18x110_Au.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     barrel_flux_return:
diff --git a/configurations/craterlake_18x110_He3.yml b/configurations/craterlake_18x110_He3.yml
index 2254276603..14887667cb 100644
--- a/configurations/craterlake_18x110_He3.yml
+++ b/configurations/craterlake_18x110_He3.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     barrel_flux_return:
diff --git a/configurations/craterlake_18x275.yml b/configurations/craterlake_18x275.yml
index b1fe4981e0..d5de38ad4e 100644
--- a/configurations/craterlake_18x275.yml
+++ b/configurations/craterlake_18x275.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     barrel_flux_return:
diff --git a/configurations/craterlake_5x100.yml b/configurations/craterlake_5x100.yml
index 25b7b6c1e9..2a400049b7 100644
--- a/configurations/craterlake_5x100.yml
+++ b/configurations/craterlake_5x100.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     barrel_flux_return:
diff --git a/configurations/craterlake_5x41.yml b/configurations/craterlake_5x41.yml
index ef920a70db..d08d4d9ef4 100644
--- a/configurations/craterlake_5x41.yml
+++ b/configurations/craterlake_5x41.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     backward:
diff --git a/configurations/craterlake_bic_6layers.yml b/configurations/craterlake_bic_6layers.yml
index 45cd342d6d..5d0426fc40 100644
--- a/configurations/craterlake_bic_6layers.yml
+++ b/configurations/craterlake_bic_6layers.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     barrel_flux_return:
diff --git a/configurations/craterlake_bic_layer1_only.yml b/configurations/craterlake_bic_layer1_only.yml
index db5420f347..819f45a220 100644
--- a/configurations/craterlake_bic_layer1_only.yml
+++ b/configurations/craterlake_bic_layer1_only.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     barrel_flux_return:
diff --git a/configurations/craterlake_no_bhcal.yml b/configurations/craterlake_no_bhcal.yml
index 889884c895..1de9c75ba0 100644
--- a/configurations/craterlake_no_bhcal.yml
+++ b/configurations/craterlake_no_bhcal.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_flux_return:
     forward_endcap_flux:
diff --git a/configurations/craterlake_no_zdc_lyso.yml b/configurations/craterlake_no_zdc_lyso.yml
index 4f24db21c8..d5160c2c81 100644
--- a/configurations/craterlake_no_zdc_lyso.yml
+++ b/configurations/craterlake_no_zdc_lyso.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     barrel_flux_return:
diff --git a/configurations/forward_detectors.yml b/configurations/forward_detectors.yml
index eedc65bf26..9d2c06f06c 100644
--- a/configurations/forward_detectors.yml
+++ b/configurations/forward_detectors.yml
@@ -18,4 +18,4 @@ features:
     forward_homogeneous:
     forward_insert_homogeneous:
   hcal:
-    lfhcal_without_space_for_insert:
+    lfhcal:
diff --git a/configurations/forward_detectors_with_inserts.yml b/configurations/forward_detectors_with_inserts.yml
index 61edc648da..7d060d28b9 100644
--- a/configurations/forward_detectors_with_inserts.yml
+++ b/configurations/forward_detectors_with_inserts.yml
@@ -18,5 +18,5 @@ features:
     forward_homogeneous:
     forward_insert_homogeneous:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
diff --git a/configurations/full.yml b/configurations/full.yml
index ef920a70db..d08d4d9ef4 100644
--- a/configurations/full.yml
+++ b/configurations/full.yml
@@ -25,7 +25,7 @@ features:
     backward_PbWO4:
   solenoid:
   hcal:
-    lfhcal_with_space_for_insert:
+    lfhcal:
     forward_insert:
     barrel_gdml:
     backward:
diff --git a/configurations/lfhcal_only.yml b/configurations/lfhcal_only.yml
index f5b7de3b73..a2ca3aab48 100644
--- a/configurations/lfhcal_only.yml
+++ b/configurations/lfhcal_only.yml
@@ -2,4 +2,4 @@ features:
   fields:
     marco:
   hcal:
-    lfhcal_without_space_for_insert:
+    lfhcal:
diff --git a/configurations/lfhcal_with_insert.yml b/configurations/lfhcal_with_insert.yml
deleted file mode 100644
index 2c166dbdc3..0000000000
--- a/configurations/lfhcal_with_insert.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-features:
-  fields:
-    marco:
-  hcal:
-    lfhcal_with_space_for_insert:
-    forward_insert:
-    forward_endcap_flux: