diff --git a/prod.ini b/prod.ini
index 9e35b5b..34f133b 100644
--- a/prod.ini
+++ b/prod.ini
@@ -40,21 +40,21 @@ s3_key=tracking/contentw3c-track-digest256
 
 # DNT="", ads category
 [tracking-protection-ads]
-categories=Advertising|Disconnect
+categories=Advertising
 output=ads-track-digest256
 s3_key=tracking/ads-track-digest256
 versioning_needed=true
 
 # DNT="", analytics category
 [tracking-protection-analytics]
-categories=Analytics|Disconnect
+categories=Analytics
 output=analytics-track-digest256
 s3_key=tracking/analytics-track-digest256
 versioning_needed=true
 
 # DNT="", social category
 [tracking-protection-social]
-categories=Social|Disconnect
+categories=Social
 output=social-track-digest256
 s3_key=tracking/social-track-digest256
 versioning_needed=true
@@ -112,7 +112,7 @@ output=mozstd-track-digest256
 s3_key=tracking/mozstd-track-digest256
 
 [tracking-protection-full]
-categories=Advertising|Analytics|Social|Disconnect|Content
+categories=Advertising|Analytics|Social|Content
 output=mozfull-track-digest256
 s3_key=tracking/mozfull-track-digest256
 
@@ -171,35 +171,10 @@ output=mozstdstaging-track-digest256
 s3_key=tracking/mozstdstaging-track-digest256
 
 [staging-tracking-protection-full]
-categories=Advertising|Analytics|Social|Disconnect|Content
+categories=Advertising|Analytics|Social|Content
 output=mozfullstaging-track-digest256
 s3_key=tracking/mozfullstaging-track-digest256
 
-[fastblock1]
-blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock1.json
-output=fastblock1-track-digest256
-s3_key=fastblock/fastblock1-track-digest256
-
-[fastblock1-whitelist]
-entity_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock1-whitelist.json
-output=fastblock1-trackwhite-digest256
-s3_key=fastblock/fastblock1-trackwhite-digest256
-
-[fastblock2]
-blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock2.json
-output=fastblock2-track-digest256
-s3_key=fastblock/fastblock2-track-digest256
-
-[fastblock2-whitelist]
-entity_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock2-whitelist.json
-output=fastblock2-trackwhite-digest256
-s3_key=fastblock/fastblock2-trackwhite-digest256
-
-[fastblock3]
-blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock3.json
-output=fastblock3-track-digest256
-s3_key=fastblock/fastblock3-track-digest256
-
 [tracking-protection-base-fingerprinting]
 categories=Advertising|Analytics|Social|Content,Fingerprinting
 output=base-fingerprinting-track-digest256
diff --git a/stage.ini b/stage.ini
index 81f15fb..027201d 100644
--- a/stage.ini
+++ b/stage.ini
@@ -46,14 +46,14 @@ s3_key=tracking/contentw3c-track-digest256
 
 # DNT="", ads category
 [tracking-protection-ads]
-categories=Advertising|Disconnect
+categories=Advertising
 output=ads-track-digest256
 s3_key=tracking/ads-track-digest256
 versioning_needed=true
 
 # DNT="", analytics category
 [tracking-protection-analytics]
-categories=Analytics|Disconnect
+categories=Analytics
 output=analytics-track-digest256
 s3_key=tracking/analytics-track-digest256
 versioning_needed=true
@@ -61,7 +61,7 @@ versioning_needed=true
 # DNT="", social category
 # NOTE: This is the *Disconnect* Social category; not the same as STP below
 [tracking-protection-social]
-categories=Social|Disconnect
+categories=Social
 output=social-track-digest256
 s3_key=tracking/social-track-digest256
 versioning_needed=true
@@ -124,7 +124,7 @@ output=mozstd-track-digest256
 s3_key=tracking/mozstd-track-digest256
 
 [tracking-protection-full]
-categories=Advertising|Analytics|Social|Disconnect|Content
+categories=Advertising|Analytics|Social|Content
 output=mozfull-track-digest256
 s3_key=tracking/mozfull-track-digest256
 
@@ -184,36 +184,10 @@ output=mozstdstaging-track-digest256
 s3_key=tracking/mozstdstaging-track-digest256
 
 [staging-tracking-protection-full]
-categories=Advertising|Analytics|Social|Disconnect|Content
+categories=Advertising|Analytics|Social|Content
 output=mozfullstaging-track-digest256
 s3_key=tracking/mozfullstaging-track-digest256
 
-[fastblock1]
-blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock1.json
-output=fastblock1-track-digest256
-s3_key=fastblock/fastblock1-track-digest256
-
-[fastblock1-whitelist]
-entity_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock1-whitelist.json
-output=fastblock1-trackwhite-digest256
-s3_key=fastblock/fastblock1-trackwhite-digest256
-
-[fastblock2]
-blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock2.json
-output=fastblock2-track-digest256
-s3_key=fastblock/fastblock2-track-digest256
-
-[fastblock2-whitelist]
-entity_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock2-whitelist.json
-output=fastblock2-trackwhite-digest256
-s3_key=fastblock/fastblock2-trackwhite-digest256
-remote_settings_upload=true
-
-[fastblock3]
-blocklist_url=https://raw.githubusercontent.com/mozilla-services/shavar-experiments/master/fastblock3.json
-output=fastblock3-track-digest256
-s3_key=fastblock/fastblock3-track-digest256
-
 [tracking-protection-base-fingerprinting]
 categories=Advertising|Analytics|Social|Content,Fingerprinting
 output=base-fingerprinting-track-digest256