diff --git a/BUILD b/BUILD
index 27591d3..40439d7 100644
--- a/BUILD
+++ b/BUILD
@@ -20,7 +20,7 @@
     ],
     deps = [
         "//plugins/its-base",
-        "//plugins/its-bugzilla/lib:j2bugzilla",
+        "@j2bugzilla//jar",
     ],
 )
 
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index c1e08a8..a3a118d 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -5,28 +5,41 @@
     name = 'j2bugzilla',
     artifact = 'com.j2bugzilla:j2bugzilla:2.2.1',
     sha1 = '397e40c85bda1eb0a13bccf3cb7130d8f815290e',
+    deps = [
+      '@xmlrpc-client//jar',
+    ],
   )
 
   maven_jar(
     name = 'xmlrpc-client',
     artifact = 'org.apache.xmlrpc:xmlrpc-client:3.1.3',
     sha1 = 'e486ad917028b52265610206fb5a1e2b5914b94b',
+    deps = [
+      '@xmlrpc-common//jar',
+    ],
   )
 
   maven_jar(
     name = 'xmlrpc-common',
     artifact = 'org.apache.xmlrpc:xmlrpc-common:3.1.3',
     sha1 = '415daf1f1473a947452588906dc9f5b3575fb44d',
+    deps = [
+      '@ws-commons-util//jar',
+    ],
   )
 
   maven_jar(
     name = 'ws-commons-util',
     artifact = 'org.apache.ws.commons.util:ws-commons-util:1.0.2',
     sha1 = '3f478e6def772c19d1053f61198fa1f6a6119238',
+    deps = ['@xml-apis//jar'],
   )
 
   maven_jar(
     name = 'xml-apis',
     artifact = 'xml-apis:xml-apis:1.0.b2',
     sha1 = '3136ca936f64c9d68529f048c2618bd356bf85c9',
+    exclude = [
+      "license/*",
+    ],
   )
diff --git a/lib/BUILD b/lib/BUILD
deleted file mode 100644
index d518c52..0000000
--- a/lib/BUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-  name = 'j2bugzilla',
-  runtime_deps = [':xmlrpc-client'],
-  exports = ["@j2bugzilla//jar"],
-)
-
-java_library(
-  name = 'xmlrpc-client',
-  runtime_deps = [':xmlrpc-common'],
-  exports = ["@xmlrpc-client//jar"],
-)
-
-java_library(
-  name = 'xmlrpc-common',
-  runtime_deps = [':ws-commons-util'],
-  exports = ["@xmlrpc-common//jar"],
-)
-
-java_library(
-  name = 'ws-commons-util',
-  runtime_deps = [':xml-apis'],
-  exports = ["@ws-commons-util//jar"],
-)
-
-java_library(
-  name = 'xml-apis',
-  exports = ["@xml-apis//jar"],
-)