diff --git a/examples/example_HSC_DRP-Prod.yaml b/examples/example_HSC_DRP-Prod.yaml
index 2118f2be..7549a3f4 100644
--- a/examples/example_HSC_DRP-Prod.yaml
+++ b/examples/example_HSC_DRP-Prod.yaml
@@ -105,15 +105,6 @@
                 prerequisites: ['step3']
                 child_config:
                     split_method: no_split
-          - Step:
-                name: step8
-                spec_block: HSC_DRP-Prod_step8
-                prerequisites: ['step6']
-                child_config:
-                    split_method: split_by_query
-                    split_max_group_size: 10
-                    split_dataset: deepCoadd
-                    split_field: tract
       data:
           butler_repo: '/repo/main+sasquatch_dev'
           prod_area: 'output/archive'
diff --git a/examples/example_HSC_DRP-Prod_steps.yaml b/examples/example_HSC_DRP-Prod_steps.yaml
index df8d56d8..682df9f7 100644
--- a/examples/example_HSC_DRP-Prod_steps.yaml
+++ b/examples/example_HSC_DRP-Prod_steps.yaml
@@ -89,11 +89,3 @@
       child_config:
           base_query: "instrument='HSC' and skymap='hsc_rings_v1'"
           split_method: no_split
-- SpecBlock:
-      name: HSC_DRP-Prod_step8
-      includes: ['step']
-      data:
-          pipeline_yaml: "${DRP_PIPE_DIR}/pipelines/HSC/DRP-Prod.yaml#step8"
-      child_config:
-          base_query: "instrument='HSC' and skymap='hsc_rings_v1'"
-          split_method: no_split
diff --git a/examples/example_HSC_DRP-RC2.yaml b/examples/example_HSC_DRP-RC2.yaml
index 39178e2e..f2759655 100644
--- a/examples/example_HSC_DRP-RC2.yaml
+++ b/examples/example_HSC_DRP-RC2.yaml
@@ -4,7 +4,7 @@
       - "${CM_CONFIGS}/example_HSC_DRP-RC2_steps.yaml"
 - SpecBlock:
       name: HSC_DRP-RC2_campaign
-      includes: ["base_campaign"]  # I am a base campaign
+      includes: ["base_campaign"]
       collections:
           campaign_source: HSC/raw/RC2
           campaign_ancillary_inputs:
@@ -91,13 +91,6 @@
                 prerequisites: ['step3']
                 child_config:
                     split_method: no_split
-          - Step:
-                name: step8
-                spec_block: HSC_DRP-RC2_step8
-                prerequisites: ['step6']
-                child_config:
-                    split_method: no_split
-
           - Step:
                 name: plots
                 spec_block: HSC_DRP-RC2_plots
@@ -107,13 +100,13 @@
           - Step:
                 name: faro_visit
                 spec_block: HSC_DRP-RC2_faro_visit
-                prerequisites: ['step6']
+                prerequisites: ['step2cde']
                 child_config:
                     split_method: no_split
           - Step:
                 name: faro_matched
                 spec_block: HSC_DRP-RC2_faro_matched
-                prerequisites: ['step6']
+                prerequisites: ['step2cde']
                 child_config:
                     split_method: no_split
           - Step:
diff --git a/examples/example_HSC_DRP-RC2_steps.yaml b/examples/example_HSC_DRP-RC2_steps.yaml
index a6fd4d11..730ef759 100644
--- a/examples/example_HSC_DRP-RC2_steps.yaml
+++ b/examples/example_HSC_DRP-RC2_steps.yaml
@@ -73,14 +73,6 @@
       child_config:
           base_query: "instrument='HSC' and skymap='hsc_rings_v1'"
           split_method: no_split
-- SpecBlock:
-      name: HSC_DRP-RC2_step8
-      includes: ['step']
-      data:
-          pipeline_yaml: "${DRP_PIPE_DIR}/pipelines/HSC/DRP-RC2.yaml#step8"
-      child_config:
-          base_query: "instrument='HSC' and skymap='hsc_rings_v1' and tract in (9615, 9697, 9813)"
-          split_method: no_split
 - SpecBlock:
       name: HSC_DRP-RC2_plots
       includes: ['step']
@@ -103,7 +95,7 @@
       data:
           pipeline_yaml: "${DRP_PIPE_DIR}/pipelines/HSC/DRP-RC2.yaml#faro_matched"
       child_config:
-          base_query: "instrument='HSC' and band != 'N921' and skymap='hsc_rings_v1'"
+          base_query: "instrument = 'HSC' and band != 'N921' and skymap = 'hsc_rings_v1' and tract in (9615, 9697, 9813)"
           split_method: no_split
 - SpecBlock:
       name: HSC_DRP-RC2_faro_tract
@@ -111,5 +103,7 @@
       data:
           pipeline_yaml: "${DRP_PIPE_DIR}/pipelines/HSC/DRP-RC2.yaml#faro_tract"
       child_config:
-          base_query: "instrument='HSC' and skymap='hsc_rings_v1' and band in ('g', 'r', 'i', 'z', 'y')"
+          base_query: >
+              instrument='HSC' AND skymap='hsc_rings_v1' and tract in (9813, 9697, 9615)
+              and band in ('g', 'r', 'i', 'z', 'y')
           split_method: no_split
diff --git a/examples/example_LSSTCam-imSim_DRP-test-med-1.yaml b/examples/example_LSSTCam-imSim_DRP-test-med-1.yaml
index 01361622..c684f0e7 100644
--- a/examples/example_LSSTCam-imSim_DRP-test-med-1.yaml
+++ b/examples/example_LSSTCam-imSim_DRP-test-med-1.yaml
@@ -79,12 +79,6 @@
                 prerequisites: ['step3']
                 child_config:
                     base_query: "instrument='LSSTCam-imSim' and skymap='DC2' and tract in (3828, 3829)"
-          - Step:
-                name: step8
-                spec_block: LSSTCam-imSim_DRP-test-med-1_step8
-                prerequisites: ['step3']
-                child_config:
-                    base_query: "instrument='LSSTCam-imSim' and skymap='DC2' and tract in (3828, 3829)"
           - Step:
                 name: faro_visit
                 spec_block: LSSTCam-imSim_DRP-test-med-1_faro_visit