diff --git a/elasticsearch/x-pack/build.gradle b/elasticsearch/x-pack/build.gradle
index 6161c9142c8..2aa9fa70fbd 100644
--- a/elasticsearch/x-pack/build.gradle
+++ b/elasticsearch/x-pack/build.gradle
@@ -16,6 +16,8 @@ ext.versions = [
 // TODO: fix this! https://github.com/elastic/x-plugins/issues/1066
 ext.compactProfile = 'full'
 
+dependencyLicenses.enabled = false
+
 dependencies {
   // license deps
   compile project(':x-plugins:elasticsearch:license:plugin-api')
diff --git a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
index 5a5f8ce0e0b..fa119a03bc2 100644
--- a/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
+++ b/elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
@@ -14,7 +14,6 @@ import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.http.HttpServerModule;
 import org.elasticsearch.index.IndexModule;
-import org.elasticsearch.index.IndexService;
 import org.elasticsearch.license.plugin.LicensePlugin;
 import org.elasticsearch.marvel.MarvelPlugin;
 import org.elasticsearch.plugins.Plugin;
@@ -123,12 +122,6 @@ public class XPackPlugin extends Plugin {
         marvelPlugin.onModule(module);
     }
 
-    public void onIndexService(IndexService indexService) {
-        shieldPlugin.onIndexService(indexService);
-        watcherPlugin.onIndexService(indexService);
-        marvelPlugin.onIndexService(indexService);
-    }
-
     public void onIndexModule(IndexModule module) {
         shieldPlugin.onIndexModule(module);
         watcherPlugin.onIndexModule(module);