diff --git a/src/main/java/io/ebeaninternal/api/SpiContainerBootup.java b/src/main/java/io/ebeaninternal/api/SpiContainerBootup.java
deleted file mode 100644
index 324da0e60..000000000
--- a/src/main/java/io/ebeaninternal/api/SpiContainerBootup.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.ebeaninternal.api;
-
-/**
- * Plugin API available to invoke something prior to container bootup.
- * <p>
- * The initial intent is to provide a hook for 'docker-run' such that we can automatically ensure
- * we have a test DB docker container running and setup ready to go.
- * </p>
- */
-public interface SpiContainerBootup {
-
-  /**
-   * Run something at bootup prior to the container starting.
-   *
-   * For example, start DB docker container(s).
-   */
-  void bootup();
-}
diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
index 0428a8893..5b9f111d7 100644
--- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
@@ -1,9 +1,5 @@
 package io.ebeaninternal.server.core;
 
-import io.ebean.BackgroundExecutor;
-import io.ebean.cache.ServerCacheFactory;
-import io.ebean.cache.ServerCacheOptions;
-import io.ebean.cache.ServerCachePlugin;
 import io.ebean.config.ContainerConfig;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.ServerConfigProvider;
@@ -13,13 +9,8 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.config.dbplatform.h2.H2Platform;
 import io.ebean.service.SpiContainer;
 import io.ebeaninternal.api.SpiBackgroundExecutor;
-import io.ebeaninternal.api.SpiContainerBootup;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.DbOffline;
-import io.ebeaninternal.server.cache.CacheManagerOptions;
-import io.ebeaninternal.server.cache.DefaultServerCacheManager;
-import io.ebeaninternal.server.cache.DefaultServerCachePlugin;
-import io.ebeaninternal.server.cache.SpiCacheManager;
 import io.ebeaninternal.server.cluster.ClusterManager;
 import io.ebeaninternal.server.core.bootup.BootupClassPathSearch;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
@@ -35,7 +26,6 @@ import javax.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Iterator;
 import java.util.List;
 import java.util.ServiceLoader;
 
@@ -52,8 +42,6 @@ public class DefaultContainer implements SpiContainer {
 
   public DefaultContainer(ContainerConfig containerConfig) {
 
-    invokeBootupPlugin();
-
     this.clusterManager = new ClusterManager(containerConfig);
     this.jndiDataSourceFactory = new JndiDataSourceLookup();
 
@@ -62,12 +50,6 @@ public class DefaultContainer implements SpiContainer {
     ShutdownManager.registerContainer(this);
   }
 
-  private void invokeBootupPlugin() {
-    for (SpiContainerBootup boot : ServiceLoader.load(SpiContainerBootup.class)) {
-      boot.bootup();
-    }
-  }
-
   @Override
   public void shutdown() {
     clusterManager.shutdown();