diff --git a/java/google/registry/backup/BUILD b/java/google/registry/backup/BUILD
index 3bafec79a..e3190d464 100644
--- a/java/google/registry/backup/BUILD
+++ b/java/google/registry/backup/BUILD
@@ -26,7 +26,6 @@ java_library(
         "@com_google_flogger",
         "@com_google_flogger_system_backend",
         "@com_google_guava",
-        "@com_googlecode_json_simple",
         "@javax_inject",
         "@javax_servlet_api",
         "@joda_time",
diff --git a/java/google/registry/batch/BUILD b/java/google/registry/batch/BUILD
index f8da2463b..b003a91a3 100644
--- a/java/google/registry/batch/BUILD
+++ b/java/google/registry/batch/BUILD
@@ -35,7 +35,6 @@ java_library(
         "@com_google_flogger_system_backend",
         "@com_google_guava",
         "@com_google_http_client",
-        "@com_googlecode_json_simple",
         "@javax_servlet_api",
         "@joda_time",
         "@org_joda_money",
diff --git a/java/google/registry/cron/BUILD b/java/google/registry/cron/BUILD
index b30ec1435..bc2b36c08 100644
--- a/java/google/registry/cron/BUILD
+++ b/java/google/registry/cron/BUILD
@@ -21,6 +21,5 @@ java_library(
         "@com_google_guava",
         "@javax_inject",
         "@javax_servlet_api",
-        "@joda_time",
     ],
 )
diff --git a/java/google/registry/export/BUILD b/java/google/registry/export/BUILD
index b3cda79c6..f2d7a4160 100644
--- a/java/google/registry/export/BUILD
+++ b/java/google/registry/export/BUILD
@@ -33,7 +33,6 @@ java_library(
         "@com_google_flogger_system_backend",
         "@com_google_guava",
         "@com_google_http_client",
-        "@com_googlecode_json_simple",
         "@javax_inject",
         "@javax_servlet_api",
         "@joda_time",
diff --git a/java/google/registry/groups/BUILD b/java/google/registry/groups/BUILD
index 58922cde4..16bc2b110 100644
--- a/java/google/registry/groups/BUILD
+++ b/java/google/registry/groups/BUILD
@@ -19,6 +19,5 @@ java_library(
         "@com_google_guava",
         "@javax_inject",
         "@javax_servlet_api",
-        "@joda_time",
     ],
 )
diff --git a/java/google/registry/keyring/api/BUILD b/java/google/registry/keyring/api/BUILD
index 68f535a10..cfb516672 100644
--- a/java/google/registry/keyring/api/BUILD
+++ b/java/google/registry/keyring/api/BUILD
@@ -17,6 +17,5 @@ java_library(
         "@com_google_guava",
         "@javax_inject",
         "@org_bouncycastle_bcpg_jdk15on",
-        "@org_bouncycastle_bcpkix_jdk15on",
     ],
 )
diff --git a/java/google/registry/keyring/kms/BUILD b/java/google/registry/keyring/kms/BUILD
index 13d338235..4eca77704 100644
--- a/java/google/registry/keyring/kms/BUILD
+++ b/java/google/registry/keyring/kms/BUILD
@@ -21,6 +21,5 @@ java_library(
         "@com_google_http_client",
         "@javax_inject",
         "@org_bouncycastle_bcpg_jdk15on",
-        "@org_bouncycastle_bcpkix_jdk15on",
     ],
 )
diff --git a/java/google/registry/mapreduce/inputs/BUILD b/java/google/registry/mapreduce/inputs/BUILD
index 8ef99729b..22b98444a 100644
--- a/java/google/registry/mapreduce/inputs/BUILD
+++ b/java/google/registry/mapreduce/inputs/BUILD
@@ -19,7 +19,6 @@ java_library(
         "@com_google_flogger",
         "@com_google_flogger_system_backend",
         "@com_google_guava",
-        "@javax_servlet_api",
         "@joda_time",
     ],
 )
diff --git a/java/google/registry/pricing/BUILD b/java/google/registry/pricing/BUILD
index bb0dc0e47..157cc1a01 100644
--- a/java/google/registry/pricing/BUILD
+++ b/java/google/registry/pricing/BUILD
@@ -14,7 +14,6 @@ java_library(
         "@com_google_dagger",
         "@com_google_guava",
         "@javax_inject",
-        "@javax_servlet_api",
         "@joda_time",
         "@org_joda_money",
     ],
diff --git a/java/google/registry/storage/drive/BUILD b/java/google/registry/storage/drive/BUILD
index caf4ba4ec..ab0175a20 100644
--- a/java/google/registry/storage/drive/BUILD
+++ b/java/google/registry/storage/drive/BUILD
@@ -14,6 +14,5 @@ java_library(
         "@com_google_guava",
         "@com_google_http_client",
         "@javax_inject",
-        "@joda_time",
     ],
 )
diff --git a/java/google/registry/tldconfig/idn/BUILD b/java/google/registry/tldconfig/idn/BUILD
index 341f1fac0..745eb4462 100644
--- a/java/google/registry/tldconfig/idn/BUILD
+++ b/java/google/registry/tldconfig/idn/BUILD
@@ -13,7 +13,5 @@ java_library(
         "//third_party/objectify:objectify-v4_1",
         "@com_google_guava",
         "@com_google_re2j",
-        "@javax_servlet_api",
-        "@joda_time",
     ],
 )
diff --git a/java/google/registry/tools/server/BUILD b/java/google/registry/tools/server/BUILD
index 78f56cee2..0c2fa9cda 100644
--- a/java/google/registry/tools/server/BUILD
+++ b/java/google/registry/tools/server/BUILD
@@ -21,7 +21,6 @@ java_library(
         "//java/google/registry/request/auth",
         "//java/google/registry/util",
         "//third_party/objectify:objectify-v4_1",
-        "@com_beust_jcommander",
         "@com_google_appengine_api_1_0_sdk",
         "@com_google_appengine_tools_appengine_gcs_client",
         "@com_google_appengine_tools_appengine_mapreduce",
@@ -34,6 +33,5 @@ java_library(
         "@javax_inject",
         "@javax_servlet_api",
         "@joda_time",
-        "@org_joda_money",
     ],
 )
diff --git a/java/google/registry/ui/server/BUILD b/java/google/registry/ui/server/BUILD
index 5948b756f..af1bc6881 100644
--- a/java/google/registry/ui/server/BUILD
+++ b/java/google/registry/ui/server/BUILD
@@ -21,9 +21,7 @@ java_library(
         "@com_google_code_findbugs_jsr305",
         "@com_google_guava",
         "@com_google_re2j",
-        "@com_googlecode_json_simple",
         "@io_bazel_rules_closure//closure/templates",
-        "@javax_servlet_api",
         "@joda_time",
     ],
 )
diff --git a/java/google/registry/util/BUILD b/java/google/registry/util/BUILD
index c22b41f93..9c01dae4e 100644
--- a/java/google/registry/util/BUILD
+++ b/java/google/registry/util/BUILD
@@ -20,7 +20,6 @@ java_library(
         "@com_google_re2j",
         "@com_ibm_icu_icu4j",
         "@javax_inject",
-        "@javax_servlet_api",
         "@joda_time",
     ],
 )
diff --git a/javatests/google/registry/backup/BUILD b/javatests/google/registry/backup/BUILD
index c72e99dd9..c0bc6a1b4 100644
--- a/javatests/google/registry/backup/BUILD
+++ b/javatests/google/registry/backup/BUILD
@@ -26,7 +26,6 @@ java_library(
         "@com_google_guava_testlib",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
-        "@javax_servlet_api",
         "@joda_time",
         "@junit",
         "@org_mockito_all",
diff --git a/javatests/google/registry/batch/BUILD b/javatests/google/registry/batch/BUILD
index b3aa19e0c..4097ece44 100644
--- a/javatests/google/registry/batch/BUILD
+++ b/javatests/google/registry/batch/BUILD
@@ -32,7 +32,6 @@ java_library(
         "@com_google_dagger",
         "@com_google_guava",
         "@com_google_http_client",
-        "@com_google_re2j",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
         "@javax_servlet_api",
diff --git a/javatests/google/registry/beam/BUILD b/javatests/google/registry/beam/BUILD
index c531f78ae..bd1f701c9 100644
--- a/javatests/google/registry/beam/BUILD
+++ b/javatests/google/registry/beam/BUILD
@@ -20,7 +20,6 @@ java_library(
         "@com_google_guava",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
-        "@joda_time",
         "@junit",
         "@org_apache_avro",
         "@org_apache_beam_runners_direct_java",
diff --git a/javatests/google/registry/cron/BUILD b/javatests/google/registry/cron/BUILD
index 75258463a..47874ad76 100644
--- a/javatests/google/registry/cron/BUILD
+++ b/javatests/google/registry/cron/BUILD
@@ -22,10 +22,7 @@ java_library(
         "@com_google_guava",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
-        "@javax_servlet_api",
-        "@joda_time",
         "@junit",
-        "@org_mockito_all",
     ],
 )
 
diff --git a/javatests/google/registry/dns/writer/clouddns/BUILD b/javatests/google/registry/dns/writer/clouddns/BUILD
index 8dcba1b31..fefb0cf95 100644
--- a/javatests/google/registry/dns/writer/clouddns/BUILD
+++ b/javatests/google/registry/dns/writer/clouddns/BUILD
@@ -20,7 +20,6 @@ java_library(
         "@com_google_guava",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
-        "@javax_servlet_api",
         "@joda_time",
         "@junit",
         "@org_mockito_all",
diff --git a/javatests/google/registry/dns/writer/dnsupdate/BUILD b/javatests/google/registry/dns/writer/dnsupdate/BUILD
index 72aa8ba80..3df84bb81 100644
--- a/javatests/google/registry/dns/writer/dnsupdate/BUILD
+++ b/javatests/google/registry/dns/writer/dnsupdate/BUILD
@@ -17,11 +17,9 @@ java_library(
         "//third_party/objectify:objectify-v4_1",
         "@com_google_dagger",
         "@com_google_guava",
-        "@com_google_re2j",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
         "@dnsjava",
-        "@javax_servlet_api",
         "@joda_time",
         "@junit",
         "@org_mockito_all",
diff --git a/javatests/google/registry/export/sheet/BUILD b/javatests/google/registry/export/sheet/BUILD
index 1666a2c9b..3d3ea1e2f 100644
--- a/javatests/google/registry/export/sheet/BUILD
+++ b/javatests/google/registry/export/sheet/BUILD
@@ -19,7 +19,6 @@ java_library(
         "@com_google_guava",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
-        "@javax_servlet_api",
         "@joda_time",
         "@junit",
         "@org_joda_money",
diff --git a/javatests/google/registry/groups/BUILD b/javatests/google/registry/groups/BUILD
index 598e0224f..183d8c526 100644
--- a/javatests/google/registry/groups/BUILD
+++ b/javatests/google/registry/groups/BUILD
@@ -27,7 +27,6 @@ java_library(
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
         "@javax_servlet_api",
-        "@joda_time",
         "@junit",
         "@org_mockito_all",
     ],
diff --git a/javatests/google/registry/keyring/api/BUILD b/javatests/google/registry/keyring/api/BUILD
index 784094c04..ca0b381a0 100644
--- a/javatests/google/registry/keyring/api/BUILD
+++ b/javatests/google/registry/keyring/api/BUILD
@@ -20,7 +20,6 @@ java_library(
         "@com_google_truth_extensions_truth_java8_extension",
         "@junit",
         "@org_bouncycastle_bcpg_jdk15on",
-        "@org_bouncycastle_bcpkix_jdk15on",
         "@org_mockito_all",
     ],
 )
diff --git a/javatests/google/registry/model/BUILD b/javatests/google/registry/model/BUILD
index cb5bac05d..b7fecc5ca 100644
--- a/javatests/google/registry/model/BUILD
+++ b/javatests/google/registry/model/BUILD
@@ -35,8 +35,6 @@ java_library(
         "@com_google_monitoring_client_contrib",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
-        "@com_sun_activation_javax_activation",
-        "@javax_xml_ws_jaxws_api",
         "@joda_time",
         "@junit",
         "@org_joda_money",
diff --git a/javatests/google/registry/module/backend/BUILD b/javatests/google/registry/module/backend/BUILD
index b30b7bb2c..cf1557f9f 100644
--- a/javatests/google/registry/module/backend/BUILD
+++ b/javatests/google/registry/module/backend/BUILD
@@ -18,10 +18,7 @@ java_library(
         "//java/google/registry/request",
         "//java/google/registry/util",
         "//javatests/google/registry/testing",
-        "@com_google_truth",
-        "@com_google_truth_extensions_truth_java8_extension",
         "@javax_servlet_api",
-        "@joda_time",
         "@junit",
         "@org_mockito_all",
     ],
diff --git a/javatests/google/registry/module/frontend/BUILD b/javatests/google/registry/module/frontend/BUILD
index 827df9aee..11a984452 100644
--- a/javatests/google/registry/module/frontend/BUILD
+++ b/javatests/google/registry/module/frontend/BUILD
@@ -17,8 +17,6 @@ java_library(
         "//java/google/registry/module/frontend",
         "//java/google/registry/request",
         "//javatests/google/registry/testing",
-        "@com_google_truth",
-        "@com_google_truth_extensions_truth_java8_extension",
         "@javax_servlet_api",
         "@junit",
         "@org_mockito_all",
diff --git a/javatests/google/registry/module/pubapi/BUILD b/javatests/google/registry/module/pubapi/BUILD
index 25af7cc1e..ddfff3049 100644
--- a/javatests/google/registry/module/pubapi/BUILD
+++ b/javatests/google/registry/module/pubapi/BUILD
@@ -17,8 +17,6 @@ java_library(
         "//java/google/registry/module/pubapi",
         "//java/google/registry/request",
         "//javatests/google/registry/testing",
-        "@com_google_truth",
-        "@com_google_truth_extensions_truth_java8_extension",
         "@javax_servlet_api",
         "@junit",
         "@org_mockito_all",
diff --git a/javatests/google/registry/module/tools/BUILD b/javatests/google/registry/module/tools/BUILD
index f40fae17c..4b55c6881 100644
--- a/javatests/google/registry/module/tools/BUILD
+++ b/javatests/google/registry/module/tools/BUILD
@@ -17,8 +17,6 @@ java_library(
         "//java/google/registry/module/tools",
         "//java/google/registry/request",
         "//javatests/google/registry/testing",
-        "@com_google_truth",
-        "@com_google_truth_extensions_truth_java8_extension",
         "@javax_servlet_api",
         "@junit",
         "@org_mockito_all",
diff --git a/javatests/google/registry/monitoring/whitebox/BUILD b/javatests/google/registry/monitoring/whitebox/BUILD
index 04f580203..26d19b29f 100644
--- a/javatests/google/registry/monitoring/whitebox/BUILD
+++ b/javatests/google/registry/monitoring/whitebox/BUILD
@@ -29,11 +29,8 @@ java_library(
         "@com_google_http_client",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
-        "@javax_servlet_api",
-        "@javax_xml_ws_jaxws_api",
         "@joda_time",
         "@junit",
-        "@org_joda_money",
         "@org_mockito_all",
     ],
 )
diff --git a/javatests/google/registry/pricing/BUILD b/javatests/google/registry/pricing/BUILD
index 3f94277da..522879290 100644
--- a/javatests/google/registry/pricing/BUILD
+++ b/javatests/google/registry/pricing/BUILD
@@ -21,7 +21,6 @@ java_library(
         "@joda_time",
         "@junit",
         "@org_joda_money",
-        "@org_mockito_all",
     ],
 )
 
diff --git a/javatests/google/registry/rdap/BUILD b/javatests/google/registry/rdap/BUILD
index 7d13de107..0d9e7ef85 100644
--- a/javatests/google/registry/rdap/BUILD
+++ b/javatests/google/registry/rdap/BUILD
@@ -30,7 +30,6 @@ java_library(
         "@com_google_truth_extensions_truth_java8_extension",
         "@com_googlecode_json_simple",
         "@javax_servlet_api",
-        "@javax_xml_ws_jaxws_api",
         "@joda_time",
         "@junit",
         "@org_mockito_all",
diff --git a/javatests/google/registry/reporting/icann/BUILD b/javatests/google/registry/reporting/icann/BUILD
index 4633112f9..7a2f5fbd3 100644
--- a/javatests/google/registry/reporting/icann/BUILD
+++ b/javatests/google/registry/reporting/icann/BUILD
@@ -26,7 +26,6 @@ java_library(
         "@com_google_http_client",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
-        "@javax_servlet_api",
         "@joda_time",
         "@junit",
         "@org_mockito_all",
diff --git a/javatests/google/registry/request/lock/BUILD b/javatests/google/registry/request/lock/BUILD
index 45ae8ec88..1d89f7433 100644
--- a/javatests/google/registry/request/lock/BUILD
+++ b/javatests/google/registry/request/lock/BUILD
@@ -23,7 +23,6 @@ java_library(
         "@com_google_code_findbugs_jsr305",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
-        "@javax_servlet_api",
         "@joda_time",
         "@junit",
         "@org_mockito_all",
diff --git a/javatests/google/registry/testing/BUILD b/javatests/google/registry/testing/BUILD
index af462a282..74825bd3a 100644
--- a/javatests/google/registry/testing/BUILD
+++ b/javatests/google/registry/testing/BUILD
@@ -50,7 +50,6 @@ java_library(
         "@com_google_guava_testlib",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
-        "@com_googlecode_json_simple",
         "@javax_inject",
         "@javax_servlet_api",
         "@joda_time",
diff --git a/javatests/google/registry/testing/mapreduce/BUILD b/javatests/google/registry/testing/mapreduce/BUILD
index 113551341..db26917ba 100644
--- a/javatests/google/registry/testing/mapreduce/BUILD
+++ b/javatests/google/registry/testing/mapreduce/BUILD
@@ -27,7 +27,6 @@ java_library(
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
         "@javax_servlet_api",
-        "@joda_time",
         "@junit",
         "@org_mockito_all",
     ],
diff --git a/javatests/google/registry/testing/sftp/BUILD b/javatests/google/registry/testing/sftp/BUILD
index 17d073d0c..906daecf7 100644
--- a/javatests/google/registry/testing/sftp/BUILD
+++ b/javatests/google/registry/testing/sftp/BUILD
@@ -17,7 +17,6 @@ java_library(
         "@junit",
         "@org_apache_ftpserver_core",
         "@org_apache_sshd_core",
-        "@org_bouncycastle_bcpg_jdk15on",
         "@org_bouncycastle_bcpkix_jdk15on",
     ],
 )
diff --git a/javatests/google/registry/tmch/BUILD b/javatests/google/registry/tmch/BUILD
index 563e734f4..412e172c0 100644
--- a/javatests/google/registry/tmch/BUILD
+++ b/javatests/google/registry/tmch/BUILD
@@ -31,8 +31,6 @@ java_library(
         "@javax_servlet_api",
         "@joda_time",
         "@junit",
-        "@org_bouncycastle_bcpg_jdk15on",
-        "@org_bouncycastle_bcpkix_jdk15on",
         "@org_mockito_all",
     ],
 )
diff --git a/javatests/google/registry/tools/server/BUILD b/javatests/google/registry/tools/server/BUILD
index 566c170d4..2b03522da 100644
--- a/javatests/google/registry/tools/server/BUILD
+++ b/javatests/google/registry/tools/server/BUILD
@@ -28,7 +28,6 @@ java_library(
         "@com_google_appengine_tools_appengine_mapreduce",
         "@com_google_appengine_tools_appengine_pipeline",
         "@com_google_guava",
-        "@com_google_re2j",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
         "@javax_servlet_api",
diff --git a/javatests/google/registry/util/BUILD b/javatests/google/registry/util/BUILD
index 527877caa..13bf5554c 100644
--- a/javatests/google/registry/util/BUILD
+++ b/javatests/google/registry/util/BUILD
@@ -20,7 +20,6 @@ java_library(
         "@com_google_flogger_system_backend",
         "@com_google_guava",
         "@com_google_guava_testlib",
-        "@com_google_re2j",
         "@com_google_truth",
         "@com_google_truth_extensions_truth_java8_extension",
         "@joda_time",