diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
index bab8a3b6c..0e9c09c19 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BatchControl.java
@@ -108,13 +108,6 @@ public final class BatchControl {
     this.batchFlushOnMixed = flushBatchOnMixed;
   }
 
-  /**
-   * Return the batchSize.
-   */
-  public int getBatchSize() {
-    return batchSize;
-  }
-
   /**
    * Set the size of batch execution.
    * <p>
diff --git a/src/main/java/io/ebeaninternal/server/persist/BindValues.java b/src/main/java/io/ebeaninternal/server/persist/BindValues.java
index 9e297d1b2..6d71e8d79 100644
--- a/src/main/java/io/ebeaninternal/server/persist/BindValues.java
+++ b/src/main/java/io/ebeaninternal/server/persist/BindValues.java
@@ -15,13 +15,6 @@ class BindValues {
   public BindValues() {
   }
 
-  /**
-   * Return the number of bind values.
-   */
-  public int size() {
-    return list.size();
-  }
-
   /**
    * Add a bind value with its JDBC datatype.
    *
diff --git a/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java b/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
index afb91da5f..c3065b779 100644
--- a/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
+++ b/src/main/java/io/ebeaninternal/server/persist/DeleteUnloadedForeignKeys.java
@@ -39,10 +39,6 @@ class DeleteUnloadedForeignKeys {
     this.deletePermanent = request.isHardDeleteCascade();
   }
 
-  public boolean isEmpty() {
-    return propList.isEmpty();
-  }
-
   public void add(BeanPropertyAssocOne<?> prop) {
     propList.add(prop);
   }
diff --git a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
index 034a74910..b7545c163 100644
--- a/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+++ b/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
@@ -4,7 +4,6 @@ import io.ebean.bean.BeanCollection;
 import io.ebean.bean.EntityBean;
 import io.ebean.bean.EntityBeanIntercept;
 import io.ebeaninternal.api.SpiSqlUpdate;
-import io.ebeaninternal.server.core.PersistRequest;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanCollectionUtil;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
diff --git a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
index f886024c7..7e7541557 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java
@@ -106,7 +106,7 @@ public class InsertHandler extends DmlHandler {
    * Check with useGeneratedKeys to get appropriate PreparedStatement.
    */
   @Override
-  protected PreparedStatement getPstmt(SpiTransaction t, String sql, boolean useGeneratedKeys) throws SQLException {
+  PreparedStatement getPstmt(SpiTransaction t, String sql, boolean useGeneratedKeys) throws SQLException {
     Connection conn = t.getInternalConnection();
     if (useGeneratedKeys) {
       return conn.prepareStatement(sql, meta.getIdentityDbColumns());
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
index 3ca0341d1..1f970ee25 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmpty.java
@@ -4,7 +4,6 @@ import io.ebean.bean.EntityBean;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 
-import java.sql.SQLException;
 import java.util.List;
 
 public class BindableIdEmpty implements BindableId {
diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java
index cf0a37869..fa8497ca5 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedProperty.java
@@ -2,7 +2,7 @@ package io.ebeaninternal.server.persist.dmlbind;
 
 import io.ebean.bean.EntityBean;
 
-public interface MatchedImportedProperty {
+interface MatchedImportedProperty {
 
   /**
    * Populate the embeddedId bean from the source entity.