diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
index a3981eb5d..7e562342d 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java
@@ -143,11 +143,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     ORM, EMBEDDED, VIEW, SQL, DOC
   }
 
-  /**
-   * The EbeanServer name. Same as the plugin name.
-   */
-  private final String serverName;
-
   /**
    * The nature/type of this bean.
    */
@@ -435,7 +430,6 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
 
     this.owner = owner;
     this.multiValueSupported = owner.isMultiValueSupported();
-    this.serverName = owner.getServerName();
     this.entityType = deploy.getEntityType();
     this.properties = deploy.getProperties();
     this.name = InternString.intern(deploy.getName());
@@ -2132,7 +2126,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the class type this BeanDescriptor describes.
    */
-  @Override @Nonnull
+  @Override
+  @Nonnull
   public Class<T> getBeanType() {
     return beanType;
   }
@@ -2144,7 +2139,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
    * instead.
    * </p>
    */
-  @Override @Nonnull
+  @Override
+  @Nonnull
   public String getFullName() {
     return fullName;
   }
@@ -2152,7 +2148,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
   /**
    * Return the short name of the entity bean.
    */
-  @Override @Nonnull
+  @Override
+  @Nonnull
   public String getName() {
     return name;
   }
@@ -3119,7 +3116,8 @@ public class BeanDescriptor<T> implements BeanType<T>, STreeType {
     return selectLastInsertedId != null;
   }
 
-  @Override @Nonnull
+  @Override
+  @Nonnull
   public Collection<? extends Property> allProperties() {
     return propertiesAll();
   }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
index 0b9946830..3fbfb49f7 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
index 3fd4e3666..99f085b6e 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java
@@ -32,11 +32,6 @@ public interface DbSqlContext {
    */
   BeanProperty[] getEncryptedProps();
 
-  /**
-   * Append a char directly to the SQL buffer.
-   */
-  DbSqlContext append(char s);
-
   /**
    * Append a string directly to the SQL buffer.
    */
diff --git a/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java b/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java
index dc3db84cc..3c9632bb8 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/IndexDefinition.java
@@ -11,15 +11,6 @@ public class IndexDefinition {
 
   private final boolean unique;
 
-  /**
-   * A single column index.
-   */
-  public IndexDefinition(String column, String name, boolean unique) {
-    this.columns = new String[]{column};
-    this.unique = unique;
-    this.name = name;
-  }
-
   public IndexDefinition(String[] columns, String name, boolean unique) {
     this.columns = columns;
     this.unique = unique;
diff --git a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
index a2b07648c..41d99e130 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/TableJoin.java
@@ -134,13 +134,6 @@ public final class TableJoin {
     return table;
   }
 
-  /**
-   * Return the type of join. LEFT JOIN etc.
-   */
-  public SqlJoinType getType() {
-    return type;
-  }
-
   public void addJoin(SqlJoinType joinType, String prefix, DbSqlContext ctx, String predicate) {
     String[] names = SplitName.split(prefix);
     String a1 = ctx.getTableAlias(names[0]);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
index 97c05670e..7992c7431 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/IdBinderEmpty.java
@@ -10,8 +10,6 @@ import io.ebeaninternal.server.type.DataBind;
 
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.IOException;
-import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
 
diff --git a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
index 14afc2feb..a71414a76 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java
@@ -155,7 +155,6 @@ public final class ImportedIdSimple implements ImportedId, Comparable<ImportedId
     }
   }
 
-
   @Override
   public void dmlAppend(GenerateDmlRequest request) {
     request.appendColumn(localDbColumn);
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
index 01ceca31a..c8c8a2a1c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java
@@ -37,7 +37,6 @@ import io.ebeaninternal.server.rawsql.SpiRawSql;
 
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -181,11 +180,6 @@ public class DeployBeanDescriptor<T> {
    */
   private BeanFindController beanFinder;
 
-  /**
-   * The table joins for this bean. Server side only.
-   */
-  private final ArrayList<DeployTableJoin> tableJoinList = new ArrayList<>(2);
-
   /**
    * Inheritance information. Server side only.
    */
@@ -245,7 +239,7 @@ public class DeployBeanDescriptor<T> {
   /**
    * Return true if there is a IdClass set.
    */
-  public boolean isIdClass() {
+  boolean isIdClass() {
     return idClass != null;
   }
 
@@ -270,13 +264,6 @@ public class DeployBeanDescriptor<T> {
     return manager.getDeploy(cls);
   }
 
-  /**
-   * Return true if this beanType is an abstract class.
-   */
-  public boolean isAbstract() {
-    return Modifier.isAbstract(beanType.getModifiers());
-  }
-
   public void setStorageEngine(String storageEngine) {
     this.storageEngine = storageEngine;
   }
@@ -502,7 +489,7 @@ public class DeployBeanDescriptor<T> {
     return cacheOptions;
   }
 
-  public DeployBeanPropertyAssocOne<?> getIdClassProperty() {
+  DeployBeanPropertyAssocOne<?> getIdClassProperty() {
     return idClassProperty;
   }
 
@@ -518,7 +505,7 @@ public class DeployBeanDescriptor<T> {
     this.orderColumn = orderColumn;
   }
 
-  public DeployBeanProperty getOrderColumn() {
+  DeployBeanProperty getOrderColumn() {
     return orderColumn;
   }
 
@@ -949,17 +936,6 @@ public class DeployBeanDescriptor<T> {
     return getFullName();
   }
 
-  /**
-   * Add a TableJoin to this type of bean. For Secondary table properties.
-   */
-  public void addTableJoin(DeployTableJoin join) {
-    tableJoinList.add(join);
-  }
-
-  List<DeployTableJoin> getTableJoins() {
-    return tableJoinList;
-  }
-
   /**
    * Return a collection of all BeanProperty deployment information.
    */
@@ -1268,7 +1244,7 @@ public class DeployBeanDescriptor<T> {
    * Returns the jackson annotated class, if jackson is present.
    */
   @SuppressWarnings("unchecked")
-  public Object /*AnnotatedClass*/ getJacksonAnnotatedClass() {
+  Object /*AnnotatedClass*/ getJacksonAnnotatedClass() {
     if (jacksonAnnotatedClass == null) {
       jacksonAnnotatedClass = new DeployBeanObtainJackson(serverConfig, beanType).obtain();
     }
diff --git a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
index 8475af9fc..276e9821c 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyLists.java
@@ -66,8 +66,6 @@ public class DeployBeanPropertyLists {
 
   private final List<BeanProperty> nonTransients = new ArrayList<>();
 
-  private final TableJoin[] tableJoins;
-
   private final BeanPropertyAssocOne<?> unidirectional;
   private final BeanProperty orderColumn;
 
@@ -138,12 +136,6 @@ public class DeployBeanPropertyLists {
       // (after the real properties have been organised into their lists)
       propertyMap.put(discProperty.getName(), discProperty);
     }
-
-    List<DeployTableJoin> deployTableJoins = deploy.getTableJoins();
-    tableJoins = new TableJoin[deployTableJoins.size()];
-    for (int i = 0; i < deployTableJoins.size(); i++) {
-      tableJoins[i] = new TableJoin(deployTableJoins.get(i));
-    }
   }
 
   /**
@@ -275,10 +267,6 @@ public class DeployBeanPropertyLists {
     return propertyMap;
   }
 
-  public TableJoin[] getTableJoin() {
-    return tableJoins;
-  }
-
   /**
    * Return the base scalar properties (excludes Id and secondary table
    * properties).
diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
index 2d87d37ef..0af0c3f24 100644
--- a/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -231,12 +231,6 @@ class DefaultDbSqlContext implements DbSqlContext {
     return this;
   }
 
-  @Override
-  public DefaultDbSqlContext append(char s) {
-    sb.append(s);
-    return this;
-  }
-
   @Override
   public void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType) {