diff --git a/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines.py b/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines.py
index 178d6683050f82ffa3518518a537de85736d114e..3fdf0d01646ce9f10c5762b67d61859b9c5940a1 100644
--- a/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines.py
+++ b/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines.py
@@ -34,6 +34,8 @@ options.input_process = 'Hlt2'
 options.monitoring_file = "monitoring.json"
 options.output_file = "spruce_all_lines.mdf"
 options.output_type = "MDF"
+from RecoConf.hlt1_muonid import make_muon_hits
+make_muon_hits.global_bind(geometry_version=2)
 
 
 def make_streams():
diff --git a/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines_realtime.py b/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines_realtime.py
index 71349fbd521a49c75eaa65421f510724fb1997c7..a8d8dbc52971f85a41adf7ed9b19fbda3ee14c75 100644
--- a/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines_realtime.py
+++ b/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines_realtime.py
@@ -52,7 +52,18 @@ options.output_manifest_file = "spruce_all_lines_realtime_newPacking_newDst.tck.
 # metainfo_repos.global_bind( extra_central_tags = [  'key-43a25419' ] )
 
 
+def _pop_line(linename, line_dict):
+    print(f"Removing {linename}")
+    line_dict.pop(linename)
+    return 0
+
+
 def make_lines():
+    for linename in [
+            name for name in sprucing_lines.keys()
+            if name.startswith('SpruceQEE_ZToMuMu_TrackEff_')
+    ]:
+        _pop_line(linename, sprucing_lines)
     return [builder() for builder in sprucing_lines.values()]
 
 
diff --git a/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines_realtime_test_old_json.py b/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines_realtime_test_old_json.py
index 5c003c876057dd55e26799a306900209fd927dd5..b0281177fee3bb97928498ed5d7d6a01145e854b 100644
--- a/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines_realtime_test_old_json.py
+++ b/Hlt/Hlt2Conf/options/sprucing/spruce_all_lines_realtime_test_old_json.py
@@ -45,7 +45,18 @@ options.output_type = 'ROOT'
 options.output_manifest_file = "spruce_all_lines_realtime_newPacking.tck.json"
 
 
+def _pop_line(linename, line_dict):
+    print(f"Removing {linename}")
+    line_dict.pop(linename)
+    return 0
+
+
 def make_lines():
+    for linename in [
+            name for name in sprucing_lines.keys()
+            if name.startswith('SpruceQEE_ZToMuMu_TrackEff_')
+    ]:
+        _pop_line(linename, sprucing_lines)
     return [builder() for builder in sprucing_lines.values()]
 
 
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/Sprucing_tests.py b/Hlt/Hlt2Conf/python/Hlt2Conf/Sprucing_tests.py
index deb59ee7795ac3bf45640d326140adc169aea1c1..ef2685fd865453d1e120f65ab19438f79198ae6e 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/Sprucing_tests.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/Sprucing_tests.py
@@ -25,6 +25,12 @@ from Moore import streams_spruce
 public_tools = [stateProvider_with_simplified_geom()]
 
 
+def _pop_line(linename, line_dict):
+    print(f"Removing {linename}")
+    line_dict.pop(linename)
+    return 0
+
+
 def spruce_streaming(options: Options):
     """
     Test streaming of sprucing lines. Produces two spruce_streaming.dst files prepended by stream name. RawBankSP functionality is tested via stream B.
@@ -67,6 +73,11 @@ def spruce_all_lines_realtime(options: Options):
     metainfo_repos.global_bind(extra_central_tags=['key-ac5f2a28'])
 
     def make_lines():
+        for linename in [
+                name for name in sprucing_lines.keys()
+                if name.startswith('SpruceQEE_ZToMuMu_TrackEff_')
+        ]:
+            _pop_line(linename, sprucing_lines)
         return [builder() for builder in sprucing_lines.values()]
 
     config = run_moore(options, make_lines, public_tools)
@@ -205,6 +216,11 @@ def spruce_all_lines_realtime_test_old_json(options: Options):
     """
 
     def make_lines():
+        for linename in [
+                name for name in sprucing_lines.keys()
+                if name.startswith('SpruceQEE_ZToMuMu_TrackEff_')
+        ]:
+            _pop_line(linename, sprucing_lines)
         return [builder() for builder in sprucing_lines.values()]
 
     ##Old file has the "Line" suffix on lines
diff --git a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/__init__.py b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/__init__.py
index 556037c98de704d22ab914ad5a0c11ca48c73486..7104b10f9eb0b58272956b645894367cc79dd827 100644
--- a/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/__init__.py
+++ b/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/__init__.py
@@ -27,3 +27,4 @@ all_lines.update(hlt2_full_lines)
 
 sprucing_lines = {}
 sprucing_lines.update(spruce_qee.sprucing_lines)
+sprucing_lines.update(spruce_qee.sprucing_trkeff_lines)
diff --git a/Hlt/Hlt2Conf/tests/options/bandwidth/spruce_bandwidth_input.py b/Hlt/Hlt2Conf/tests/options/bandwidth/spruce_bandwidth_input.py
index 8df342e05df9e0688cf308a22e60e48c19fc345e..17a94351ec4f7079e8e1c72e55e640e2d1a8e276 100644
--- a/Hlt/Hlt2Conf/tests/options/bandwidth/spruce_bandwidth_input.py
+++ b/Hlt/Hlt2Conf/tests/options/bandwidth/spruce_bandwidth_input.py
@@ -20,6 +20,7 @@ If updating, please also update spruce_bandwidth_input.yaml
 
 from Moore import options
 from RecoConf.calorimeter_reconstruction import make_digits
+from RecoConf.hlt1_muonid import make_muon_hits
 
 options.set_input_and_conds_from_testfiledb(
     'upgrade-minbias-hlt2-full-output-Dec2023')
@@ -27,3 +28,4 @@ options.input_type = "MDF"
 options.evt_max = 1000
 options.n_threads = 1
 make_digits.global_bind(calo_raw_bank=False)
+make_muon_hits.global_bind(geometry_version=2)