diff --git a/ebean-api/src/main/java/io/ebean/ExtendedServer.java b/ebean-api/src/main/java/io/ebean/ExtendedServer.java
index 1bb21a721..0088e9c2b 100644
--- a/ebean-api/src/main/java/io/ebean/ExtendedServer.java
+++ b/ebean-api/src/main/java/io/ebean/ExtendedServer.java
@@ -112,19 +112,6 @@ public interface ExtendedServer {
    */
   <T> Stream<T> findStream(Query<T> query, Transaction transaction);
 
-  /**
-   * Deprecated - migrate to findStream().
-   * <p>
-   * Execute the query returning the result as a Stream.
-   * <p>
-   * Note that this can support very large queries iterating any number of results.
-   * To do so internally it can use multiple persistence contexts.
-   * <p>
-   * Note that the stream needs to be closed so use with try with resources.
-   */
-  @Deprecated
-  <T> Stream<T> findLargeStream(Query<T> query, Transaction transaction);
-
   /**
    * Execute the query visiting the each bean one at a time.
    * <p>
diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java
index 4ddfc9af5..0bc8939f3 100644
--- a/ebean-api/src/main/java/io/ebean/Query.java
+++ b/ebean-api/src/main/java/io/ebean/Query.java
@@ -750,29 +750,6 @@ public interface Query<T> extends CancelableQuery {
    */
   Stream<T> findStream();
 
-  /**
-   * Deprecated - migrate to findStream.
-   * <p>
-   * Execute the query returning the result as a Stream.
-   * <p>
-   * Note that this uses multiple persistence contexts such that we can use
-   * it with a large number of results.
-   * </p>
-   * <pre>{@code
-   *
-   *  // use try with resources to ensure Stream is closed
-   *
-   *  try (Stream<Customer> stream = query.findLargeStream()) {
-   *    stream
-   *    .map(...)
-   *    .collect(...);
-   *  }
-   *
-   * }</pre>
-   */
-  @Deprecated
-  Stream<T> findLargeStream();
-
   /**
    * Execute the query processing the beans one at a time.
    * <p>
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
index 2f51eeffd..bbc7725a2 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
@@ -1376,11 +1376,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     }
   }
 
-  @Override
-  public <T> Stream<T> findLargeStream(Query<T> query, Transaction transaction) {
-    return findStream(query, transaction);
-  }
-
   @Override
   public <T> Stream<T> findStream(Query<T> query, Transaction transaction) {
     return toStream(findIterate(query, transaction));
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 8011cc1b5..da8caf0b1 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
@@ -251,11 +251,6 @@ final class DefaultFetchGroupQuery<T> implements SpiFetchGroupQuery<T>, SpiQuery
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
   }
 
-  @Override
-  public Stream<T> findLargeStream() {
-    throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
-  }
-
   @Override
   public void findEach(Consumer<T> consumer) {
     throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup");
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 307b2713c..6aa0f9a6a 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
@@ -1456,11 +1456,6 @@ public final class DefaultOrmQuery<T> extends AbstractQuery implements SpiQuery<
     return server.findStream(this, transaction);
   }
 
-  @Override
-  public Stream<T> findLargeStream() {
-    return server.findLargeStream(this, transaction);
-  }
-
   @Override
   public List<Version<T>> findVersions() {
     this.temporalMode = TemporalMode.VERSIONS;
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 ed3c35350..566ce3f27 100644
--- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
+++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java
@@ -1646,14 +1646,6 @@ public abstract class TQRootBean<T, R> {
     return query.findStream();
   }
 
-  /**
-   * Deprecated - migrate to findStream().
-   */
-  @Deprecated
-  public Stream<T> findLargeStream() {
-    return query.findLargeStream();
-  }
-
   /**
    * Execute the query returning the set of objects.
    * <p>
diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java
index 00922b438..2b2ed7567 100644
--- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java
+++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java
@@ -387,24 +387,6 @@ public class QCustomerTest {
     assertThat(sb.toString()).isEqualTo("stream1|stream2");
   }
 
-  @Test
-  public void testFindLargeStream() {
-    insertCustomer("largeStream1");
-    insertCustomer("largeStream2");
-    insertCustomer("largeStream3");
-
-    StringJoiner sb = new StringJoiner("|");
-    try (Stream<Customer> stream = new QCustomer()
-      .name.startsWith("largeStream")
-      .id.asc()
-      .findLargeStream()) {
-
-      stream.forEach(it -> sb.add(it.getName()));
-    }
-
-    assertThat(sb.toString()).isEqualTo("largeStream1|largeStream2|largeStream3");
-  }
-
   @Test
   public void testFilterMany() {
 
diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
index de0e61945..b7d58fe84 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java
@@ -653,11 +653,6 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer {
     return null;
   }
 
-  @Override
-  public <T> Stream<T> findLargeStream(Query<T> query, Transaction transaction) {
-    return null;
-  }
-
   @Override
   public <T> void findEach(Query<T> query, Consumer<T> consumer, Transaction transaction) {
   }
diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java
index b53276d40..894141654 100644
--- a/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java
+++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java
@@ -37,27 +37,6 @@ public class TestQueryFindStream extends BaseTestCase {
     }
   }
 
-  @Test
-  public void findLargeStream_basic() {
-    ResetBasicData.reset();
-    try (Stream<Customer> stream = DB.find(Customer.class)
-      .findLargeStream()) {
-
-      // bad example, don't use a stream like this when we can
-      // use findSingleAttributeList() instead
-      final List<String> namesStream = stream
-        .map(Customer::getName)
-        .collect(toList());
-
-      final List<String> namesQuery = DB.find(Customer.class)
-        .select("name")
-        .findSingleAttributeList();
-
-      assertThat(namesStream).hasSize(namesQuery.size());
-      assertThat(namesStream).containsAll(namesQuery);
-    }
-  }
-
   @Test
   public void manualTest_findSteam_when_closeWithResources() {
     // confirm manually the stream is closed via try with resources block