diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java
index eea6c89ef..0f3c48dd4 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorManager.java
@@ -182,7 +182,7 @@ public class BeanDescriptorManager implements BeanDescriptorMap {
     this.deployOrmXml = config.getDeployOrmXml();
     this.deployUtil = config.getDeployUtil();
 
-    this.beanManagerFactory = new BeanManagerFactory(serverConfig, config.getDatabasePlatform());
+    this.beanManagerFactory = new BeanManagerFactory(config.getDatabasePlatform());
 
     this.updateChangesOnly = serverConfig.isUpdateChangesOnly();
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java
index e8d514070..c29838389 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanFkeyProperty.java
@@ -1,7 +1,6 @@
 package com.avaje.ebeaninternal.server.deploy;
 
 import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.text.StringFormatter;
 import com.avaje.ebean.text.StringParser;
 import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 
@@ -159,18 +158,10 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     throw new RuntimeException("ElPropertyDeploy only - not implemented");
   }
 
-  public StringFormatter getStringFormatter() {
-    throw new RuntimeException("ElPropertyDeploy only - not implemented");
-  }
-
   public StringParser getStringParser() {
     throw new RuntimeException("ElPropertyDeploy only - not implemented");
   }
 
-  public void elSetReference(EntityBean bean) {
-    throw new RuntimeException("ElPropertyDeploy only - not implemented");
-  }
-
   public Object elConvertType(Object value) {
     throw new RuntimeException("ElPropertyDeploy only - not implemented");
   }
@@ -187,8 +178,4 @@ public final class BeanFkeyProperty implements ElPropertyValue {
     throw new RuntimeException("ElPropertyDeploy only - not implemented");
   }
 
-  public String getDeployProperty() {
-    throw new RuntimeException("ElPropertyDeploy only - not implemented");
-  }
-
 }
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java
index b09d75c83..ff9bb39bb 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanManagerFactory.java
@@ -1,8 +1,6 @@
 package com.avaje.ebeaninternal.server.deploy;
 
-import com.avaje.ebean.config.ServerConfig;
 import com.avaje.ebean.config.dbplatform.DatabasePlatform;
-import com.avaje.ebeaninternal.server.persist.BeanPersister;
 import com.avaje.ebeaninternal.server.persist.BeanPersisterFactory;
 import com.avaje.ebeaninternal.server.persist.dml.DmlBeanPersisterFactory;
 
@@ -11,17 +9,15 @@ import com.avaje.ebeaninternal.server.persist.dml.DmlBeanPersisterFactory;
  */
 public class BeanManagerFactory {
 
-	final BeanPersisterFactory peristerFactory;
-	
-	public BeanManagerFactory(ServerConfig config, DatabasePlatform dbPlatform) {
-		peristerFactory = new DmlBeanPersisterFactory(dbPlatform);
-	}
-	
-	public <T> BeanManager<T> create(BeanDescriptor<T> desc) {
-		
-		BeanPersister persister = peristerFactory.create(desc);
+  final BeanPersisterFactory persisterFactory;
 
-		return new BeanManager<T>(desc, persister);
-	}
+  public BeanManagerFactory(DatabasePlatform dbPlatform) {
+    persisterFactory = new DmlBeanPersisterFactory(dbPlatform);
+  }
+
+  public <T> BeanManager<T> create(BeanDescriptor<T> desc) {
+
+    return new BeanManager<T>(desc, persisterFactory.create(desc));
+  }
 
 }