diff --git a/deploy/agencies.json b/deploy/agencies.json
index fdd12b62..3b32e764 100644
--- a/deploy/agencies.json
+++ b/deploy/agencies.json
@@ -149,6 +149,16 @@
     "agencyName": "federal-trade-commission",
     "awsBucketPath": "data/federal-trade-commission"
   },
+  {
+    "analyticsReportIds": "468622292",
+    "agencyName": "food-nutrition-service",
+    "awsBucketPath": "data/food-nutrition-service"
+  },
+  {
+    "analyticsReportIds": "469578931",
+    "agencyName": "forest-service",
+    "awsBucketPath": "data/forest-service"
+  },
   {
     "analyticsReportIds": "395251184",
     "agencyName": "general-services-administration",
@@ -244,6 +254,11 @@
     "agencyName": "national-endowment-humanities",
     "awsBucketPath": "data/national-endowment-humanities"
   },
+  {
+    "analyticsReportIds": "468338198",
+    "agencyName": "national-institute-standards-technology",
+    "awsBucketPath": "data/national-institute-standards-technology"
+  },
   {
     "analyticsReportIds": "395452956",
     "agencyName": "national-labor-relations-board",
@@ -289,6 +304,11 @@
     "agencyName": "nuclear-waste-technical-review-board",
     "awsBucketPath": "data/nuclear-waste-technical-review-board"
   },
+  {
+    "analyticsReportIds": "470606068",
+    "agencyName": "occupational-safety-health-commission",
+    "awsBucketPath": "data/occupational-safety-health-commission"
+  },
   {
     "analyticsReportIds": "395449711",
     "agencyName": "office-director-national-intelligence",
@@ -309,6 +329,11 @@
     "agencyName": "office-personnel-management",
     "awsBucketPath": "data/office-personnel-management"
   },
+  {
+    "analyticsReportIds": "468633563",
+    "agencyName": "patent-trademark-office",
+    "awsBucketPath": "data/patent-trademark-office"
+  },
   {
     "analyticsReportIds": "395459211",
     "agencyName": "peace-corps",
diff --git a/deploy/envs/access-board.config.sh b/deploy/envs/access-board.config.sh
deleted file mode 100644
index fd2d2372..00000000
--- a/deploy/envs/access-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# U.S. Access Board
-# Access Board Agency
-export ANALYTICS_REPORT_IDS="395456687"
-export AGENCY_NAME=access-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/agency-global-media.config.sh b/deploy/envs/agency-global-media.config.sh
deleted file mode 100644
index 60d5fb98..00000000
--- a/deploy/envs/agency-global-media.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# U.S. Agency for Global Media
-# USAGM Agency
-export ANALYTICS_REPORT_IDS="395453549"
-export AGENCY_NAME=agency-global-media
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/agency-international-development.config.sh b/deploy/envs/agency-international-development.config.sh
deleted file mode 100644
index c9bd1948..00000000
--- a/deploy/envs/agency-international-development.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Agency for International Development
-# USAID Agency
-export ANALYTICS_REPORT_IDS="395450427"
-export AGENCY_NAME=agency-international-development
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/agriculture.config.sh b/deploy/envs/agriculture.config.sh
deleted file mode 100644
index ff79e815..00000000
--- a/deploy/envs/agriculture.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of Agriculture
-# USDA Agency
-export ANALYTICS_REPORT_IDS="395461442"
-export AGENCY_NAME=agriculture
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/american-battle-monuments-commission.config.sh b/deploy/envs/american-battle-monuments-commission.config.sh
deleted file mode 100644
index cf95c807..00000000
--- a/deploy/envs/american-battle-monuments-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# American Battle Monuments Commission
-# ABMC Agency
-export ANALYTICS_REPORT_IDS="395213963"
-export AGENCY_NAME=american-battle-monuments-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/commerce.config.sh b/deploy/envs/commerce.config.sh
deleted file mode 100644
index b7322ef2..00000000
--- a/deploy/envs/commerce.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of Commerce
-# DOC Agency
-export ANALYTICS_REPORT_IDS="395253935"
-export AGENCY_NAME=commerce
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/commission-civil-rights.config.sh b/deploy/envs/commission-civil-rights.config.sh
deleted file mode 100644
index 9f098d57..00000000
--- a/deploy/envs/commission-civil-rights.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# U.S. Commission on Civil Rights
-# USCCR Agency
-export ANALYTICS_REPORT_IDS="395463975"
-export AGENCY_NAME=commission-civil-rights
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/commodity-futures-trading-commission.config.sh b/deploy/envs/commodity-futures-trading-commission.config.sh
deleted file mode 100644
index 18064573..00000000
--- a/deploy/envs/commodity-futures-trading-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Commodity Futures Trading Commission
-# CFTC Agency
-export ANALYTICS_REPORT_IDS="395256592"
-export AGENCY_NAME=commodity-futures-trading-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/consumer-financial-protection-bureau.config.sh b/deploy/envs/consumer-financial-protection-bureau.config.sh
deleted file mode 100644
index 31786b56..00000000
--- a/deploy/envs/consumer-financial-protection-bureau.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Consumer Financial Protection Bureau
-# CFPB Agency
-export ANALYTICS_REPORT_IDS="395252447"
-export AGENCY_NAME=consumer-financial-protection-bureau
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/consumer-product-safety-commission.config.sh b/deploy/envs/consumer-product-safety-commission.config.sh
deleted file mode 100644
index c88a6c3c..00000000
--- a/deploy/envs/consumer-product-safety-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Consumer Product Safety Commission
-# CPSC Agency
-export ANALYTICS_REPORT_IDS="395229915"
-export AGENCY_NAME=consumer-product-safety-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/corporation-national-community-service.config.sh b/deploy/envs/corporation-national-community-service.config.sh
deleted file mode 100644
index 7f741f4a..00000000
--- a/deploy/envs/corporation-national-community-service.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Corporation for National and Community Service
-# CNCS Agency
-export ANALYTICS_REPORT_IDS="395233541"
-export AGENCY_NAME=corporation-national-community-service
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/defense-nuclear-facilities-safety-board.config.sh b/deploy/envs/defense-nuclear-facilities-safety-board.config.sh
deleted file mode 100644
index 37145f8d..00000000
--- a/deploy/envs/defense-nuclear-facilities-safety-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Defense Nuclear Facilities Safety Board
-# DNFSB Agency
-export ANALYTICS_REPORT_IDS="395236998"
-export AGENCY_NAME=defense-nuclear-facilities-safety-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/defense.config.sh b/deploy/envs/defense.config.sh
deleted file mode 100644
index 61b85b65..00000000
--- a/deploy/envs/defense.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of Defense
-# DOD Agency
-export ANALYTICS_REPORT_IDS="395251747"
-export AGENCY_NAME=defense
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/denali-commission.config.sh b/deploy/envs/denali-commission.config.sh
deleted file mode 100644
index 5dff8e03..00000000
--- a/deploy/envs/denali-commission.config.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Denali Commission
-export ANALYTICS_REPORT_IDS="451719437"
-export AGENCY_NAME=denali-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/education.config.sh b/deploy/envs/education.config.sh
deleted file mode 100644
index 932eac7f..00000000
--- a/deploy/envs/education.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of Education
-# Dept of Education Agency
-export ANALYTICS_REPORT_IDS="395246701"
-export AGENCY_NAME=education
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/energy.config.sh b/deploy/envs/energy.config.sh
deleted file mode 100644
index 07987baa..00000000
--- a/deploy/envs/energy.config.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Department of Energy
-# DOE Agency
-export ANALYTICS_REPORT_IDS="395236978"
-export AGENCY_NAME=energy
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
-
diff --git a/deploy/envs/environmental-protection-agency.config.sh b/deploy/envs/environmental-protection-agency.config.sh
deleted file mode 100644
index b46ce1b4..00000000
--- a/deploy/envs/environmental-protection-agency.config.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Environmental Protection Agency
-# EPA Agency
-export ANALYTICS_REPORT_IDS="395252829"
-export AGENCY_NAME=environmental-protection-agency
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
-
diff --git a/deploy/envs/equal-employment-opportunity-commission.config.sh b/deploy/envs/equal-employment-opportunity-commission.config.sh
deleted file mode 100644
index 86d1d445..00000000
--- a/deploy/envs/equal-employment-opportunity-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Equal Employment Opportunity Commission
-# EEOC Agency
-export ANALYTICS_REPORT_IDS="395227834"
-export AGENCY_NAME=equal-employment-opportunity-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/executive-office-president.config.sh b/deploy/envs/executive-office-president.config.sh
deleted file mode 100644
index 646b2351..00000000
--- a/deploy/envs/executive-office-president.config.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Executive Office of the President
-export ANALYTICS_REPORT_IDS="395437322"
-export AGENCY_NAME=executive-office-president
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/farm-credit-administration.config.sh b/deploy/envs/farm-credit-administration.config.sh
deleted file mode 100644
index c23d1931..00000000
--- a/deploy/envs/farm-credit-administration.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Farm Credit Administration
-# FCA Agency
-export ANALYTICS_REPORT_IDS="433204342"
-export AGENCY_NAME=farm-credit-administration
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/federal-bureau-investigation.config.sh b/deploy/envs/federal-bureau-investigation.config.sh
deleted file mode 100644
index 8e2af577..00000000
--- a/deploy/envs/federal-bureau-investigation.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Federal Bureau of Investigation
-# FBI Agency
-export ANALYTICS_REPORT_IDS="395455171"
-export AGENCY_NAME=federal-bureau-investigation
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/federal-deposit-insurance-corporation.config.sh b/deploy/envs/federal-deposit-insurance-corporation.config.sh
deleted file mode 100644
index 297c05d8..00000000
--- a/deploy/envs/federal-deposit-insurance-corporation.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Federal Deposit Insurance Corporation
-# FDIC Agency
-export ANALYTICS_REPORT_IDS="395455467"
-export AGENCY_NAME=federal-deposit-insurance-corporation
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/federal-election-commission.config.sh b/deploy/envs/federal-election-commission.config.sh
deleted file mode 100644
index 7def33f2..00000000
--- a/deploy/envs/federal-election-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Federal Election Commission
-# FEC Agency
-export ANALYTICS_REPORT_IDS="395446398"
-export AGENCY_NAME=federal-election-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/federal-energy-regulatory-commission.config.sh b/deploy/envs/federal-energy-regulatory-commission.config.sh
deleted file mode 100644
index a2ab235d..00000000
--- a/deploy/envs/federal-energy-regulatory-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Federal Energy Regulatory Commission
-# FERC Agency
-export ANALYTICS_REPORT_IDS="395457791"
-export AGENCY_NAME=federal-energy-regulatory-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/federal-housing-finance-agency.config.sh b/deploy/envs/federal-housing-finance-agency.config.sh
deleted file mode 100644
index f702d10e..00000000
--- a/deploy/envs/federal-housing-finance-agency.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Federal Housing Finance Agency
-# FHFA Agency
-export ANALYTICS_REPORT_IDS="395442267"
-export AGENCY_NAME=federal-housing-finance-agency
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/federal-maritime-commission.config.sh b/deploy/envs/federal-maritime-commission.config.sh
deleted file mode 100644
index 9cb793e3..00000000
--- a/deploy/envs/federal-maritime-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Federal Maritime Commission
-# FMC Agency
-export ANALYTICS_REPORT_IDS="445602092"
-export AGENCY_NAME=federal-maritime-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/federal-mine-safety-health-review-commission.config.sh b/deploy/envs/federal-mine-safety-health-review-commission.config.sh
deleted file mode 100644
index d360a863..00000000
--- a/deploy/envs/federal-mine-safety-health-review-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Federal Mine Safety and Health Review Commission
-# FMSHRC Agency
-export ANALYTICS_REPORT_IDS="446076957"
-export AGENCY_NAME=federal-mine-safety-health-review-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/federal-retirement-thrift-investment-board.config.sh b/deploy/envs/federal-retirement-thrift-investment-board.config.sh
deleted file mode 100644
index 81baa709..00000000
--- a/deploy/envs/federal-retirement-thrift-investment-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Federal Retirement Thrift Investment Board
-# FRTIB Agency
-export ANALYTICS_REPORT_IDS="395449505"
-export AGENCY_NAME=federal-retirement-thrift-investment-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/federal-trade-commission.config.sh b/deploy/envs/federal-trade-commission.config.sh
deleted file mode 100644
index 041c810c..00000000
--- a/deploy/envs/federal-trade-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Federal Trade Commission
-# FTC Agency
-export ANALYTICS_REPORT_IDS="395449415"
-export AGENCY_NAME=federal-trade-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/general-services-administration.config.sh b/deploy/envs/general-services-administration.config.sh
deleted file mode 100644
index 594ea7d5..00000000
--- a/deploy/envs/general-services-administration.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# General Services Administration
-# GSA Agency
-export ANALYTICS_REPORT_IDS="395251184"
-export AGENCY_NAME=general-services-administration
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/health-human-services.config.sh b/deploy/envs/health-human-services.config.sh
deleted file mode 100644
index 7bd60c4d..00000000
--- a/deploy/envs/health-human-services.config.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Department of Health and Human Services
-# HHS Agency
-export ANALYTICS_REPORT_IDS="395460726"
-export AGENCY_NAME=health-human-services
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
-
diff --git a/deploy/envs/homeland-security.config.sh b/deploy/envs/homeland-security.config.sh
deleted file mode 100644
index 8c80a4c9..00000000
--- a/deploy/envs/homeland-security.config.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Department of Homeland Security
-# DHS Agency
-export ANALYTICS_REPORT_IDS="395243274"
-export AGENCY_NAME=homeland-security
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
-
diff --git a/deploy/envs/housing-urban-development.config.sh b/deploy/envs/housing-urban-development.config.sh
deleted file mode 100644
index f5b68d4f..00000000
--- a/deploy/envs/housing-urban-development.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of Housing and Urban Development
-# HUD Agency
-export ANALYTICS_REPORT_IDS="395457289"
-export AGENCY_NAME=housing-urban-development
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/inter-american-foundation.config.sh b/deploy/envs/inter-american-foundation.config.sh
deleted file mode 100644
index c7067e2f..00000000
--- a/deploy/envs/inter-american-foundation.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Inter-American Foundation
-# IAF Agency
-export ANALYTICS_REPORT_IDS="424430051"
-export AGENCY_NAME=inter-american-foundation
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/interior.config.sh b/deploy/envs/interior.config.sh
deleted file mode 100644
index 02b68892..00000000
--- a/deploy/envs/interior.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of the Interior
-# DOI Agency
-export ANALYTICS_REPORT_IDS="395227436"
-export AGENCY_NAME=interior
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/international-development-finance-corporation.config.sh b/deploy/envs/international-development-finance-corporation.config.sh
deleted file mode 100644
index b981ddb3..00000000
--- a/deploy/envs/international-development-finance-corporation.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# International Development Finance Corporation
-# DFC Agency
-export ANALYTICS_REPORT_IDS="395113416"
-export AGENCY_NAME=international-development-finance-corporation
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/international-trade-commission.config.sh b/deploy/envs/international-trade-commission.config.sh
deleted file mode 100644
index 1c2f8da4..00000000
--- a/deploy/envs/international-trade-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# U.S. International Trade Commission
-# USITC Agency
-export ANALYTICS_REPORT_IDS="395460932"
-export AGENCY_NAME=international-trade-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/justice.config.sh b/deploy/envs/justice.config.sh
deleted file mode 100644
index 95e11f5b..00000000
--- a/deploy/envs/justice.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of Justice
-# DOJ Agency
-export ANALYTICS_REPORT_IDS="395234366"
-export AGENCY_NAME=justice
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/labor.config.sh b/deploy/envs/labor.config.sh
deleted file mode 100644
index 62943b2d..00000000
--- a/deploy/envs/labor.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of Labor
-# DOL Agency
-export ANALYTICS_REPORT_IDS="395262085"
-export AGENCY_NAME=labor
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/merit-systems-protection-board.config.sh b/deploy/envs/merit-systems-protection-board.config.sh
deleted file mode 100644
index b2adc784..00000000
--- a/deploy/envs/merit-systems-protection-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Merit Systems Protection Board
-# MSPB Agency
-export ANALYTICS_REPORT_IDS="395444789"
-export AGENCY_NAME=merit-systems-protection-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/millennium-challenge-corporation.config.sh b/deploy/envs/millennium-challenge-corporation.config.sh
deleted file mode 100644
index 5e7bdc44..00000000
--- a/deploy/envs/millennium-challenge-corporation.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Millennium Challenge Corporation
-# MCC Agency
-export ANALYTICS_REPORT_IDS="395454156"
-export AGENCY_NAME=millennium-challenge-corporation
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-aeronautics-space-administration.config.sh b/deploy/envs/national-aeronautics-space-administration.config.sh
deleted file mode 100644
index 7a28c874..00000000
--- a/deploy/envs/national-aeronautics-space-administration.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Aeronautics and Space Administration
-# NASA Agency
-export ANALYTICS_REPORT_IDS="395454267"
-export AGENCY_NAME=national-aeronautics-space-administration
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-archives-records-administration.config.sh b/deploy/envs/national-archives-records-administration.config.sh
deleted file mode 100644
index df366838..00000000
--- a/deploy/envs/national-archives-records-administration.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Archives and Records Administration
-# NARA Agency
-export ANALYTICS_REPORT_IDS="395458906"
-export AGENCY_NAME=national-archives-records-administration
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-capital-planning-commission.config.sh b/deploy/envs/national-capital-planning-commission.config.sh
deleted file mode 100644
index 6cd414f1..00000000
--- a/deploy/envs/national-capital-planning-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Capital Planning Commission
-# NCPC Agency
-export ANALYTICS_REPORT_IDS="395459624"
-export AGENCY_NAME=national-capital-planning-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-council-disability.config.sh b/deploy/envs/national-council-disability.config.sh
deleted file mode 100644
index b89515ad..00000000
--- a/deploy/envs/national-council-disability.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Council on Disability
-# NCD Agency
-export ANALYTICS_REPORT_IDS="432696271"
-export AGENCY_NAME=national-council-disability
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-credit-union-administration.config.sh b/deploy/envs/national-credit-union-administration.config.sh
deleted file mode 100644
index 29e09040..00000000
--- a/deploy/envs/national-credit-union-administration.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Credit Union Administration
-# NCUA Agency
-export ANALYTICS_REPORT_IDS="395453466"
-export AGENCY_NAME=national-credit-union-administration
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-education-association.config.sh b/deploy/envs/national-education-association.config.sh
deleted file mode 100644
index 5b39aa86..00000000
--- a/deploy/envs/national-education-association.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Education Association
-# NEA Agency
-export ANALYTICS_REPORT_IDS="395455475"
-export AGENCY_NAME=national-education-association
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-endowment-humanities.config.sh b/deploy/envs/national-endowment-humanities.config.sh
deleted file mode 100644
index 62d693e4..00000000
--- a/deploy/envs/national-endowment-humanities.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Endowment for the Humanities
-# NEH Agency
-export ANALYTICS_REPORT_IDS="395450224"
-export AGENCY_NAME=national-endowment-humanities
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-labor-relations-board.config.sh b/deploy/envs/national-labor-relations-board.config.sh
deleted file mode 100644
index 3fbcdc98..00000000
--- a/deploy/envs/national-labor-relations-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Labor Relations Board
-# NLRB Agency
-export ANALYTICS_REPORT_IDS="395452956"
-export AGENCY_NAME=national-labor-relations-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-mediation-board.config.sh b/deploy/envs/national-mediation-board.config.sh
deleted file mode 100644
index a271ed04..00000000
--- a/deploy/envs/national-mediation-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Mediation Board
-# NMB Agency
-export ANALYTICS_REPORT_IDS="425930242"
-export AGENCY_NAME=national-mediation-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-park-service.config.sh b/deploy/envs/national-park-service.config.sh
deleted file mode 100644
index c9c9d64b..00000000
--- a/deploy/envs/national-park-service.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Park Service
-# NPS Agency
-export ANALYTICS_REPORT_IDS="395455884"
-export AGENCY_NAME=national-park-service
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-reconnaissance-office.config.sh b/deploy/envs/national-reconnaissance-office.config.sh
deleted file mode 100644
index 80bed2fe..00000000
--- a/deploy/envs/national-reconnaissance-office.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Reconnaissance Office
-# NMB Agency
-export ANALYTICS_REPORT_IDS="426999924"
-export AGENCY_NAME=national-reconnaissance-office
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-science-foundation.config.sh b/deploy/envs/national-science-foundation.config.sh
deleted file mode 100644
index 5da5aa8a..00000000
--- a/deploy/envs/national-science-foundation.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Science Foundation
-# NSF Agency
-export ANALYTICS_REPORT_IDS="395443988"
-export AGENCY_NAME=national-science-foundation
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/national-transportation-safety-board.config.sh b/deploy/envs/national-transportation-safety-board.config.sh
deleted file mode 100644
index 42327fdf..00000000
--- a/deploy/envs/national-transportation-safety-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# National Transportation Safety Board
-# NTSB Agency
-export ANALYTICS_REPORT_IDS="395446803"
-export AGENCY_NAME=national-transportation-safety-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/nuclear-regulatory-commission.config.sh b/deploy/envs/nuclear-regulatory-commission.config.sh
deleted file mode 100644
index 361dba99..00000000
--- a/deploy/envs/nuclear-regulatory-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Nuclear Regulatory Commission
-# NRC Agency
-export ANALYTICS_REPORT_IDS="395460734"
-export AGENCY_NAME=nuclear-regulatory-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/nuclear-waste-technical-review-board.config.sh b/deploy/envs/nuclear-waste-technical-review-board.config.sh
deleted file mode 100644
index 0fa553e7..00000000
--- a/deploy/envs/nuclear-waste-technical-review-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Nuclear Waste Technical Review Board
-# NWTRB Agency
-export ANALYTICS_REPORT_IDS="436324183"
-export AGENCY_NAME=nuclear-waste-technical-review-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/office-director-national-intelligence.config.sh b/deploy/envs/office-director-national-intelligence.config.sh
deleted file mode 100644
index f7f953e5..00000000
--- a/deploy/envs/office-director-national-intelligence.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Office of the Director of National Intelligence
-# ODNI Agency
-export ANALYTICS_REPORT_IDS="395449711"
-export AGENCY_NAME=office-director-national-intelligence
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/office-government-ethics.config.sh b/deploy/envs/office-government-ethics.config.sh
deleted file mode 100644
index 535f5e22..00000000
--- a/deploy/envs/office-government-ethics.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Office of Government Ethics
-# OGE Agency
-export ANALYTICS_REPORT_IDS="395449111"
-export AGENCY_NAME=office-government-ethics
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/office-navajo-hopi-indian-relocation.config.sh b/deploy/envs/office-navajo-hopi-indian-relocation.config.sh
deleted file mode 100644
index e67f5ca0..00000000
--- a/deploy/envs/office-navajo-hopi-indian-relocation.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Office of Navajo and Hopi Indian Relocation
-# ONHIR Agency
-export ANALYTICS_REPORT_IDS="426919252"
-export AGENCY_NAME=office-navajo-hopi-indian-relocation
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/office-personnel-management.config.sh b/deploy/envs/office-personnel-management.config.sh
deleted file mode 100644
index 9df2c0e7..00000000
--- a/deploy/envs/office-personnel-management.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Office of Personnel Management
-# OPM Agency
-export ANALYTICS_REPORT_IDS="395441051"
-export AGENCY_NAME=office-personnel-management
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/peace-corps.config.sh b/deploy/envs/peace-corps.config.sh
deleted file mode 100644
index 43a26c12..00000000
--- a/deploy/envs/peace-corps.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Peace Corps
-# Peace Corps Agency
-export ANALYTICS_REPORT_IDS="395459211"
-export AGENCY_NAME=peace-corps
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/pension-benefit-guaranty-corporation.config.sh b/deploy/envs/pension-benefit-guaranty-corporation.config.sh
deleted file mode 100644
index 25e55ddf..00000000
--- a/deploy/envs/pension-benefit-guaranty-corporation.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Pension Benefit Guaranty Corporation
-# PBGC Agency
-export ANALYTICS_REPORT_IDS="395457296"
-export AGENCY_NAME=pension-benefit-guaranty-corporation
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/postal-inspection-service.config.sh b/deploy/envs/postal-inspection-service.config.sh
deleted file mode 100644
index adf28794..00000000
--- a/deploy/envs/postal-inspection-service.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# U.S. Postal Inspection Service
-# USPIS Agency
-export ANALYTICS_REPORT_IDS="422356675"
-export AGENCY_NAME=postal-inspection-service
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/postal-regulatory-commission.config.sh b/deploy/envs/postal-regulatory-commission.config.sh
deleted file mode 100644
index 27ee24a0..00000000
--- a/deploy/envs/postal-regulatory-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Postal Regulatory Commission
-# PRC Agency
-export ANALYTICS_REPORT_IDS="407064941"
-export AGENCY_NAME=postal-regulatory-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/postal-service.config.sh b/deploy/envs/postal-service.config.sh
deleted file mode 100644
index 6eb03833..00000000
--- a/deploy/envs/postal-service.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Postal Service
-# USPS Agency
-export ANALYTICS_REPORT_IDS="395466379"
-export AGENCY_NAME=postal-service
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/privacy-civil-liberties-oversight-board.config.sh b/deploy/envs/privacy-civil-liberties-oversight-board.config.sh
deleted file mode 100644
index c4f7cf4e..00000000
--- a/deploy/envs/privacy-civil-liberties-oversight-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Privacy and Civil Liberties Oversight Board
-# PCLOB Agency
-export ANALYTICS_REPORT_IDS="395461632"
-export AGENCY_NAME=privacy-civil-liberties-oversight-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/public-buildings-reform-board.config.sh b/deploy/envs/public-buildings-reform-board.config.sh
deleted file mode 100644
index f92e3f43..00000000
--- a/deploy/envs/public-buildings-reform-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Public Buildings Reform Board
-# PBRB Agency
-export ANALYTICS_REPORT_IDS="397625389"
-export AGENCY_NAME=public-buildings-reform-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/railroad-retirement-board.config.sh b/deploy/envs/railroad-retirement-board.config.sh
deleted file mode 100644
index 45a23a08..00000000
--- a/deploy/envs/railroad-retirement-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# U.S. Railroad Retirement Board
-# RRB Agency
-export ANALYTICS_REPORT_IDS="395455287"
-export AGENCY_NAME=railroad-retirement-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/securities-exchange-commission.config.sh b/deploy/envs/securities-exchange-commission.config.sh
deleted file mode 100644
index 8e81bf73..00000000
--- a/deploy/envs/securities-exchange-commission.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Securities and Exchange Commission
-# SEC Agency
-export ANALYTICS_REPORT_IDS="395463162"
-export AGENCY_NAME=securities-exchange-commission
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/small-business-administration.config.sh b/deploy/envs/small-business-administration.config.sh
deleted file mode 100644
index 528b1cb1..00000000
--- a/deploy/envs/small-business-administration.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Small Business Administration
-# SBA Agency
-export ANALYTICS_REPORT_IDS="395437327"
-export AGENCY_NAME=small-business-administration
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/social-security-administration.config.sh b/deploy/envs/social-security-administration.config.sh
deleted file mode 100644
index 8d239378..00000000
--- a/deploy/envs/social-security-administration.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Social Security Administration
-# SSA Agency
-export ANALYTICS_REPORT_IDS="397629136"
-export AGENCY_NAME=social-security-administration
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/special-inspector-general-afghanistan-restoration.config.sh b/deploy/envs/special-inspector-general-afghanistan-restoration.config.sh
deleted file mode 100644
index 7b57c89f..00000000
--- a/deploy/envs/special-inspector-general-afghanistan-restoration.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Special Inpector General for Afghanistan Restoration
-# SIGAR Agency
-export ANALYTICS_REPORT_IDS="395438870"
-export AGENCY_NAME=special-inspector-general-afghanistan-restoration
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/state.config.sh b/deploy/envs/state.config.sh
deleted file mode 100644
index fec5dbd2..00000000
--- a/deploy/envs/state.config.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dept of State Agency
-export ANALYTICS_REPORT_IDS="395253929"
-export AGENCY_NAME=state
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/surface-transportation-board.config.sh b/deploy/envs/surface-transportation-board.config.sh
deleted file mode 100644
index 4d2776da..00000000
--- a/deploy/envs/surface-transportation-board.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Surface Transportation Board
-# STB Agency
-export ANALYTICS_REPORT_IDS="395461338"
-export AGENCY_NAME=surface-transportation-board
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/tennessee-valley-authority.config.sh b/deploy/envs/tennessee-valley-authority.config.sh
deleted file mode 100644
index ac908054..00000000
--- a/deploy/envs/tennessee-valley-authority.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Tennessee Valley Authority
-# TVA Agency
-export ANALYTICS_REPORT_IDS="449053587"
-export AGENCY_NAME=tennessee-valley-authority
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/trade-development-agency.config.sh b/deploy/envs/trade-development-agency.config.sh
deleted file mode 100644
index 5e0442d5..00000000
--- a/deploy/envs/trade-development-agency.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# U.S. Trade and Development Agency
-# USTDA Agency
-export ANALYTICS_REPORT_IDS="397513313"
-export AGENCY_NAME=trade-development-agency
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/transportation.config.sh b/deploy/envs/transportation.config.sh
deleted file mode 100644
index c25cc430..00000000
--- a/deploy/envs/transportation.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of Transportation
-# DOT Agency
-export ANALYTICS_REPORT_IDS="395245646"
-export AGENCY_NAME=transportation
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/treasury.config.sh b/deploy/envs/treasury.config.sh
deleted file mode 100644
index 05b1d882..00000000
--- a/deploy/envs/treasury.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of the Treasury
-# Dept of Treasury Agency
-export ANALYTICS_REPORT_IDS="395126080"
-export AGENCY_NAME=treasury
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/udall-foundation.config.sh b/deploy/envs/udall-foundation.config.sh
deleted file mode 100644
index 24d2221a..00000000
--- a/deploy/envs/udall-foundation.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Udall Foundation
-# Udall Foundation Agency
-export ANALYTICS_REPORT_IDS="431046847"
-export AGENCY_NAME=udall-foundation
-export AWS_BUCKET_PATH=data/$AGENCY_NAME
diff --git a/deploy/envs/veterans-affairs.config.sh b/deploy/envs/veterans-affairs.config.sh
deleted file mode 100644
index 5dcb48f1..00000000
--- a/deploy/envs/veterans-affairs.config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Department of Veterans Affairs
-# Veterans Affairs Agency
-export ANALYTICS_REPORT_IDS="395452039"
-export AGENCY_NAME=veterans-affairs
-export AWS_BUCKET_PATH=data/$AGENCY_NAME