diff --git a/ebean-api/src/main/java/io/ebean/event/BulkTableEvent.java b/ebean-api/src/main/java/io/ebean/event/BulkTableEvent.java
index d37743303..a16ec8e3b 100644
--- a/ebean-api/src/main/java/io/ebean/event/BulkTableEvent.java
+++ b/ebean-api/src/main/java/io/ebean/event/BulkTableEvent.java
@@ -10,14 +10,6 @@ public interface BulkTableEvent {
    */
   String tableName();
 
-  /**
-   * Deprecated migrate to tableName().
-   */
-  @Deprecated
-  default String getTableName() {
-    return tableName();
-  }
-
   /**
    * Return true if rows were inserted.
    */
diff --git a/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java b/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java
index 96bf6eed1..f12869b7a 100644
--- a/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java
+++ b/ebean-api/src/main/java/io/ebean/plugin/SpiServer.java
@@ -18,79 +18,31 @@ public interface SpiServer extends Database {
    */
   DatabaseConfig config();
 
-  /**
-   * Migrate to config().
-   */
-  @Deprecated
-  default DatabaseConfig getServerConfig() {
-    return config();
-  }
-
   /**
    * Return the DatabasePlatform for this database.
    */
   DatabasePlatform databasePlatform();
 
-  /**
-   * Migrate to config().
-   */
-  @Deprecated
-  default DatabasePlatform getDatabasePlatform() {
-    return databasePlatform();
-  }
-
   /**
    * Return all the bean types registered on this server instance.
    */
   List<? extends BeanType<?>> beanTypes();
 
-  /**
-   * Migrate to beanTypes().
-   */
-  @Deprecated
-  default List<? extends BeanType<?>> getBeanTypes() {
-    return beanTypes();
-  }
-
   /**
    * Return the bean type for a given entity bean class.
    */
   <T> BeanType<T> beanType(Class<T> beanClass);
 
-  /**
-   * Migrate to beanType().
-   */
-  @Deprecated
-  default <T> BeanType<T> getBeanType(Class<T> beanClass) {
-    return beanType(beanClass);
-  }
-
   /**
    * Return the bean types mapped to the given base table.
    */
   List<? extends BeanType<?>> beanTypes(String baseTableName);
 
-  /**
-   * Migrate to beanTypes().
-   */
-  @Deprecated
-  default List<? extends BeanType<?>> getBeanTypes(String baseTableName) {
-    return beanTypes(baseTableName);
-  }
-
   /**
    * Return the bean type for a given doc store queueId.
    */
   BeanType<?> beanTypeForQueueId(String queueId);
 
-  /**
-   * Migrate to beanTypes().
-   */
-  @Deprecated
-  default BeanType<?> getBeanTypeForQueueId(String queueId) {
-    return beanTypeForQueueId(queueId);
-  }
-
   /**
    * Return a BeanLoader.
    */