diff --git a/configs/V31/object_performance/tau_trigger.yaml b/configs/V31/object_performance/tau_trigger.yaml
index 7f31dfd0..9a99be32 100644
--- a/configs/V31/object_performance/tau_trigger.yaml
+++ b/configs/V31/object_performance/tau_trigger.yaml
@@ -53,59 +53,3 @@ TauTriggerEndcap_90perc:
     min: 0
     max: 150
     step: 6
-
-TauTriggerBarrel_50perc:
-  sample: VBFHToTauTau
-  version: V31
-  match_test_to_ref: True
-  reference_object:
-    object: "part_tau"
-    x_arg: "Pt"
-    label: "Gen Taus"
-    cuts:
-      event:
-        - "{dr_0.3} < 0.15"
-        - "abs({eta}) < 1.5"
-      object:
-        - "abs({eta}) < 2.4"
-  test_objects:
-    nnTau:default:barrel: "Pt"
-    caloTau:default:barrel: "Pt"
-  xlabel: "Gen. pT (GeV)"
-  ylabel: "Trigger Efficiency (barrel, L1 $p_T > <threshold>$ GeV)"
-  thresholds: [20, 30]
-  scalings:
-    method: "naive"
-    threshold: 0.50
-  binning:
-    min: 0
-    max: 150
-    step: 6
-
-TauTriggerEndcap_50perc:
-  sample: VBFHToTauTau
-  version: V31
-  match_test_to_ref: True
-  reference_object:
-    object: "part_tau"
-    x_arg: "Pt"
-    label: "Gen Taus"
-    cuts:
-      event:
-        - "{dr_0.3} < 0.15"
-        - "abs({eta}) > 1.5"
-      object:
-        - "abs({eta}) < 2.4"
-  test_objects:
-    nnTau:default:endcap: "Pt"
-    caloTau:default:endcap: "Pt"
-  xlabel: "Gen. pT (GeV)"
-  ylabel: "Trigger Efficiency (endcap, L1 $p_T > <threshold>$ GeV)"
-  thresholds: [20, 30]
-  scalings:
-    method: "naive"
-    threshold: 0.50
-  binning:
-    min: 0
-    max: 150
-    step: 6
diff --git a/configs/V31/objects/taus.yaml b/configs/V31/objects/taus.yaml
index 2f1bf535..386adf5b 100644
--- a/configs/V31/objects/taus.yaml
+++ b/configs/V31/objects/taus.yaml
@@ -24,6 +24,8 @@ caloTau:
     endcap: [1.5, 2.4]
   ids:
     default:
+      label: "Calo Tau, pt>20"
       cuts:
         inclusive:
           - "abs({eta}) < 2.4"
+          - "{pt} > 20"
diff --git a/configs/V33nano/object_performance/muon_trigger.yaml b/configs/V33nano/object_performance/muon_trigger.yaml
index 6365cf4f..9453fdb8 100644
--- a/configs/V33nano/object_performance/muon_trigger.yaml
+++ b/configs/V33nano/object_performance/muon_trigger.yaml
@@ -10,12 +10,11 @@ MuonsTrigger_Barrel:
       event:
         - "(({statusFlags}>>7)&1) == 1"
         - "abs({pdgId}) == 13"
-        - "{dr_0.3} < 0.15"
       object:
         - "abs({eta}) < 0.83"
   test_objects:
-    gmtMuon:default:barrel: "pt"
-    gmtTkMuon:default:barrel: "pt"
+    L1gmtMuon:default:barrel: "pt"
+    L1gmtTkMuon:default:barrel: "pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (barrel, L1 $p_T > 20$ GeV)"
   thresholds: [20, 25]
@@ -39,13 +38,12 @@ MuonsTrigger_Overlap:
       event:
         - "(({statusFlags}>>7)&1) == 1"
         - "abs({pdgId}) == 13"
-        - "{dr_0.3} < 0.15"
       object:
         - "abs({eta}) > 0.83"
         - "abs({eta}) < 1.24"
   test_objects:
-    gmtMuon:default:overlap: "pt"
-    gmtTkMuon:default:overlap: "pt"
+    L1gmtMuon:default:overlap: "pt"
+    L1gmtTkMuon:default:overlap: "pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (overlap, L1 $p_T > 20$ GeV)"
   thresholds: [20, 25]
@@ -69,12 +67,11 @@ MuonsTrigger_Endcap:
       event:
         - "(({statusFlags}>>7)&1) == 1"
         - "abs({pdgId}) == 13"
-        - "{dr_0.3} < 0.15"
       object:
         - "abs({eta}) > 1.24"
   test_objects:
-    gmtMuon:default:endcap: "pt"
-    gmtTkMuon:default:endcap: "pt"
+    L1gmtMuon:default:endcap: "pt"
+    L1gmtTkMuon:default:endcap: "pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (endcap, L1 $p_T > 20$ GeV)"
   thresholds: [20, 25]
diff --git a/configs/V33nano/object_performance/tau_trigger.yaml b/configs/V33nano/object_performance/tau_trigger.yaml
index c141d9e3..5c988399 100644
--- a/configs/V33nano/object_performance/tau_trigger.yaml
+++ b/configs/V33nano/object_performance/tau_trigger.yaml
@@ -13,10 +13,10 @@ TauTriggerBarrel_90perc:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    L1nnPuppiTau:default: "pt"
-    L1hpsTau:default: "pt"
-    L1caloTau:default: "pt"
-    L1nnCaloTau:default: "pt"
+    L1nnPuppiTau:default:barrel: "pt"
+    L1hpsTau:default:barrel: "pt"
+    L1caloTau:default:barrel: "pt"
+    L1nnCaloTau:default:barrel: "pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (barrel, L1 $p_T > <threshold>$ GeV)"
   thresholds: [20, 30]
@@ -43,10 +43,10 @@ TauTriggerEndcap_90perc:
       object:
         - "abs({eta}) < 2.4"
   test_objects:
-    L1nnPuppiTau:default: "pt"
-    L1hpsTau:default: "pt"
-    L1caloTau:default: "pt"
-    L1nnCaloTau:default: "pt"
+    L1nnPuppiTau:default:endcap: "pt"
+    L1hpsTau:default:endcap: "pt"
+    L1caloTau:default:endcap: "pt"
+    L1nnCaloTau:default:endcap: "pt"
   xlabel: "Gen. pT (GeV)"
   ylabel: "Trigger Efficiency (endcap, L1 $p_T > <threshold>$ GeV)"
   thresholds: [20, 30]
@@ -57,63 +57,3 @@ TauTriggerEndcap_90perc:
     min: 0
     max: 150
     step: 6
-
-TauTriggerBarrel_50perc:
-  sample: VBFHToTauTau
-  version: V33nano
-  match_test_to_ref: True
-  reference_object:
-    object: "GenVisTau"
-    x_arg: "pt"
-    label: "Gen Taus"
-    cuts:
-      event:
-        # - "{dr_0.3} < 0.15"
-        - "abs({eta}) < 1.5"
-      object:
-        - "abs({eta}) < 2.4"
-  test_objects:
-    L1nnPuppiTau:default: "pt"
-    L1hpsTau:default: "pt"
-    L1caloTau:default: "pt"
-    L1nnCaloTau:default: "pt"
-  xlabel: "Gen. pT (GeV)"
-  ylabel: "Trigger Efficiency (barrel, L1 $p_T > <threshold>$ GeV)"
-  thresholds: [20, 30]
-  scalings:
-    method: "naive"
-    threshold: 0.50
-  binning:
-    min: 0
-    max: 150
-    step: 6
-
-TauTriggerEndcap_50perc:
-  sample: VBFHToTauTau
-  version: V33nano
-  match_test_to_ref: True
-  reference_object:
-    object: "GenVisTau"
-    x_arg: "pt"
-    label: "Gen Taus"
-    cuts:
-      event:
-        # - "{dr_0.3} < 0.15"
-        - "abs({eta}) > 1.5"
-      object:
-        - "abs({eta}) < 2.4"
-  test_objects:
-    L1nnPuppiTau:default: "pt"
-    L1hpsTau:default: "pt"
-    L1caloTau:default: "pt"
-    L1nnCaloTau:default: "pt"
-  xlabel: "Gen. pT (GeV)"
-  ylabel: "Trigger Efficiency (endcap, L1 $p_T > <threshold>$ GeV)"
-  thresholds: [20, 30]
-  scalings:
-    method: "naive"
-    threshold: 0.50
-  binning:
-    min: 0
-    max: 150
-    step: 6
diff --git a/configs/V33nano/objects/jets.yaml b/configs/V33nano/objects/jets.yaml
index 0e4882a2..087e1c87 100644
--- a/configs/V33nano/objects/jets.yaml
+++ b/configs/V33nano/objects/jets.yaml
@@ -84,7 +84,4 @@ L1TrackJet:
     barrel: [0, 1.5]
     endcap: [1.5, 2.4]
   ids:
-    default:
-      cuts:
-        inclusive:
-          - "abs({eta}) < 7"
+    default