diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index 6d30a144ad..239ad0bdf0 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -45,17 +45,6 @@ filegroup(
     ),
 )
 
-filegroup(
-    name = "bower_components",
-    srcs = glob(
-        [
-            "bower_components/**/*.html",
-            "bower_components/**/*.js",
-            "bower_components/**/*.js.map",
-        ],
-    ),
-)
-
 genrule2(
     name = "pg_code_zip",
     srcs = [":pg_code"],
diff --git a/polygerrit-ui/app/rules.bzl b/polygerrit-ui/app/rules.bzl
index e1304e6aeb..cd4819a914 100644
--- a/polygerrit-ui/app/rules.bzl
+++ b/polygerrit-ui/app/rules.bzl
@@ -19,6 +19,7 @@ def polygerrit_bundle(name, srcs, outs, app):
         ],
         language = "ECMASCRIPT_2017",
         deps = [name + "_closure_lib"],
+        dependency_mode = "PRUNE_LEGACY",
     )
 
     # TODO(davido): Remove JSC_REFERENCE_BEFORE_DECLARE when this is fixed upstream:
diff --git a/tools/bzl/js.bzl b/tools/bzl/js.bzl
index 8805614ea9..b14a76163e 100644
--- a/tools/bzl/js.bzl
+++ b/tools/bzl/js.bzl
@@ -494,6 +494,7 @@ def polygerrit_plugin(name, app, srcs = [], deps = [], externs = [], assets = No
         deps = [
             name + "_closure_lib",
         ],
+        dependency_mode = "PRUNE_LEGACY",
     )
 
     if html_plugin:
diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl
index fa5cbd1673..68766a34f0 100644
--- a/tools/bzl/maven_jar.bzl
+++ b/tools/bzl/maven_jar.bzl
@@ -94,6 +94,7 @@ def _generate_build_files(ctx, binjar, srcjar):
         srcjar_attr = 'srcjar = "%s",' % srcjar
     contents = """
 {header}
+load("@rules_java//java:defs.bzl", "java_import")
 package(default_visibility = ['//visibility:public'])
 java_import(
     name = 'jar',