diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java
index 33cf9efcb..e137f64ba 100644
--- a/ebean-api/src/main/java/io/ebean/ExpressionList.java
+++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java
@@ -196,13 +196,6 @@ public interface ExpressionList<T> {
    */
   Query<T> forUpdate();
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdate(Query.LockType lockType);
-
   /**
    * Execute using "for update" clause with No Wait option.
    * <p>
@@ -211,13 +204,6 @@ public interface ExpressionList<T> {
    */
   Query<T> forUpdateNoWait();
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update nowait" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdateNoWait(Query.LockType lockType);
-
   /**
    * Execute using "for update" clause with Skip Locked option.
    * <p>
@@ -226,13 +212,6 @@ public interface ExpressionList<T> {
    */
   Query<T> forUpdateSkipLocked();
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update skip locked" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdateSkipLocked(Query.LockType lockType);
-
   /**
    * Execute the query including soft deleted rows.
    */
diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index ab1c97122..7a33e66f4 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -1673,12 +1673,6 @@ public interface Query<T> {
    */
   Query<T> forUpdate();
 
-  /**
-   * Execute using "for update" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdate(LockType lockType);
-
   /**
    * Execute using "for update" clause with "no wait" option.
    * <p>
@@ -1688,12 +1682,6 @@ public interface Query<T> {
    */
   Query<T> forUpdateNoWait();
 
-  /**
-   * Execute using "for update nowait" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdateNoWait(LockType lockType);
-
   /**
    * Execute using "for update" clause with "skip locked" option.
    * <p>
@@ -1703,12 +1691,6 @@ public interface Query<T> {
    */
   Query<T> forUpdateSkipLocked();
 
-  /**
-   * Execute using "for update skip locked" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  Query<T> forUpdateSkipLocked(LockType lockType);
-
   /**
    * Return true if this query has forUpdate set.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 569fb0868..13c111713 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -501,31 +501,16 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.forUpdate();
   }
 
-  @Override
-  public Query<T> forUpdate(Query.LockType lockType) {
-    return query.forUpdate(lockType);
-  }
-
   @Override
   public Query<T> forUpdateNoWait() {
     return query.forUpdateNoWait();
   }
 
-  @Override
-  public Query<T> forUpdateNoWait(Query.LockType lockType) {
-    return query.forUpdateNoWait(lockType);
-  }
-
   @Override
   public Query<T> forUpdateSkipLocked() {
     return query.forUpdateSkipLocked();
   }
 
-  @Override
-  public Query<T> forUpdateSkipLocked(Query.LockType lockType) {
-    return query.forUpdateSkipLocked(lockType);
-  }
-
   @Override
   public Query<T> select(String fetchProperties) {
     return query.select(fetchProperties);
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 81548b19a..4f1784f11 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -506,31 +506,16 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.forUpdate();
   }
 
-  @Override
-  public Query<T> forUpdate(Query.LockType lockType) {
-    return exprList.forUpdate(lockType);
-  }
-
   @Override
   public Query<T> forUpdateNoWait() {
     return exprList.forUpdateNoWait();
   }
 
-  @Override
-  public Query<T> forUpdateNoWait(Query.LockType lockType) {
-    return exprList.forUpdateNoWait(lockType);
-  }
-
   @Override
   public Query<T> forUpdateSkipLocked() {
     return exprList.forUpdateSkipLocked();
   }
 
-  @Override
-  public Query<T> forUpdateSkipLocked(Query.LockType lockType) {
-    return exprList.forUpdateSkipLocked(lockType);
-  }
-
   /**
    * Path exists - for the given path in a JSON document.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
index 8f2351846..f7bfdadf1 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java
@@ -569,21 +569,6 @@ class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T> {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
-  @Override
-  public Query<T> forUpdate(LockType lockType) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
-  @Override
-  public Query<T> forUpdateNoWait(LockType lockType) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
-  @Override
-  public Query<T> forUpdateSkipLocked(LockType lockType) {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
   @Override
   public boolean isForUpdate() {
     return false;
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
index ef58d99f6..d625e87be 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -975,21 +975,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return setForUpdateWithMode(LockWait.WAIT, LockType.DEFAULT);
   }
 
-  @Override
-  public Query<T> forUpdate(LockType lockType) {
-    return setForUpdateWithMode(LockWait.WAIT, lockType);
-  }
-
-  @Override
-  public Query<T> forUpdateNoWait(LockType lockType) {
-    return setForUpdateWithMode(LockWait.NOWAIT, lockType);
-  }
-
-  @Override
-  public Query<T> forUpdateSkipLocked(LockType lockType) {
-    return setForUpdateWithMode(LockWait.SKIPLOCKED, lockType);
-  }
-
   @Override
   public DefaultOrmQuery<T> forUpdateNoWait() {
     return setForUpdateWithMode(LockWait.NOWAIT, LockType.DEFAULT);
diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
index 66858dc10..72876a00d 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -721,16 +721,6 @@ public abstract class TQRootBean<T, R> {
     return root;
   }
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  public R forUpdate(Query.LockType lockType) {
-    query.forUpdate(lockType);
-    return root;
-  }
-
   /**
    * Execute using "for update" clause with "no wait" option.
    * <p>
@@ -741,16 +731,6 @@ public abstract class TQRootBean<T, R> {
     return root;
   }
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update nowait" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  public R forUpdateNoWait(Query.LockType lockType) {
-    query.forUpdateNoWait(lockType);
-    return root;
-  }
-
   /**
    * Execute using "for update" clause with "skip locked" option.
    * <p>
@@ -762,16 +742,6 @@ public abstract class TQRootBean<T, R> {
     return root;
   }
 
-  /**
-   * Deprecated - migrate to withLock().
-   * Execute using "for update skip locked" with given lock type (currently Postgres only).
-   */
-  @Deprecated
-  public R forUpdateSkipLocked(Query.LockType lockType) {
-    query.forUpdateSkipLocked(lockType);
-    return root;
-  }
-
   /**
    * Return this query as an UpdateQuery.
    *