diff --git a/src/main/java/com/avaje/ebean/ExpressionList.java b/src/main/java/com/avaje/ebean/ExpressionList.java
index 882fbdc36..1937ee002 100644
--- a/src/main/java/com/avaje/ebean/ExpressionList.java
+++ b/src/main/java/com/avaje/ebean/ExpressionList.java
@@ -205,11 +205,6 @@ public interface ExpressionList<T> {
    */
   <K> Map<K, T> findMap();
 
-  /**
-   * Return a typed map specifying the key property and type.
-   */
-  <K> Map<K, T> findMap(String keyProperty, Class<K> keyType);
-
   /**
    * Execute the query returning a list of values for a single property.
    *
diff --git a/src/main/java/com/avaje/ebean/Model.java b/src/main/java/com/avaje/ebean/Model.java
index 4431c18de..4f5b7418c 100644
--- a/src/main/java/com/avaje/ebean/Model.java
+++ b/src/main/java/com/avaje/ebean/Model.java
@@ -664,16 +664,6 @@ public abstract class Model {
       return query().findMap();
     }
 
-    /**
-     * Executes the query and returns the results as a map of the objects specifying the map key
-     * property.
-     * <p>
-     * Equivalent to {@link Query#findMap(String, Class)}
-     */
-    public <K> Map<K, T> findMap(String keyProperty, Class<K> keyType) {
-      return query().findMap(keyProperty, keyType);
-    }
-
     /**
      * Executes a find row count query in a background thread.
      * <p>
diff --git a/src/main/java/com/avaje/ebean/Query.java b/src/main/java/com/avaje/ebean/Query.java
index 920a148f8..0c60ecd23 100644
--- a/src/main/java/com/avaje/ebean/Query.java
+++ b/src/main/java/com/avaje/ebean/Query.java
@@ -672,11 +672,6 @@ public interface Query<T> {
    */
   <K> Map<K, T> findMap();
 
-  /**
-   * Return a typed map specifying the key property and type.
-   */
-  <K> Map<K, T> findMap(String keyProperty, Class<K> keyType);
-
   /**
    * Execute the query returning a list of values for a single property.
    *
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
index 3dbf67571..d5840c3a0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -383,11 +383,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.findMap();
   }
 
-  @Override
-  public <K> Map<K, T> findMap(String keyProperty, Class<K> keyType) {
-    return query.findMap(keyProperty, keyType);
-  }
-
   @Override
   public <A> List<A> findSingleAttributeList() {
     return query.findSingleAttributeList();
diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java
index 21a085ed6..9132b0807 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java
@@ -395,11 +395,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.findMap();
   }
 
-  @Override
-  public <K> Map<K, T> findMap(String keyProperty, Class<K> keyType) {
-    return exprList.findMap(keyProperty, keyType);
-  }
-
   @Override
   public <A> List<A> findSingleAttributeList() {
     return exprList.findSingleAttributeList();
diff --git a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index 75ae46827..2adcf19ad 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1148,12 +1148,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
 
   @Override
   @SuppressWarnings("unchecked")
-  public <K> Map<K, T> findMap(String keyProperty, Class<K> keyType) {
-    setMapKey(keyProperty);
-    return (Map<K, T>) findMap();
-  }
-
-  @Override
   public <A> List<A> findSingleAttributeList() {
     return (List<A>)server.findSingleAttributeList(this, null);
   }
diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonMap.java b/src/test/java/com/avaje/tests/text/json/TestJsonMap.java
index 9caa18da8..ecf582b50 100644
--- a/src/test/java/com/avaje/tests/text/json/TestJsonMap.java
+++ b/src/test/java/com/avaje/tests/text/json/TestJsonMap.java
@@ -41,7 +41,7 @@ public class TestJsonMap extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Map<String, Customer> map = Ebean.find(Customer.class).findMap("id", String.class);
+    Map<String, Customer> map = Ebean.find(Customer.class).findMap();
 
     JsonContext jsonContext = Ebean.json();
     JsonWriteOptions options = JsonWriteOptions.parsePath("(id,status,name)");