diff --git a/src/main/java/com/avaje/ebean/EbeanServer.java b/src/main/java/com/avaje/ebean/EbeanServer.java
index 91c14fa5a..3071535b5 100644
--- a/src/main/java/com/avaje/ebean/EbeanServer.java
+++ b/src/main/java/com/avaje/ebean/EbeanServer.java
@@ -857,29 +857,6 @@ public interface EbeanServer {
    */
   <T> FutureList<T> findFutureList(Query<T> query, Transaction transaction);
 
-  /**
-   * Return a PagedList for this query using pageIndex and pageSize.
-   * <p>
-   * The benefit of using this over just using the normal {@link Query#setFirstRow(int)} and
-   * {@link Query#setMaxRows(int)} is that it additionally wraps an optional call to
-   * {@link Query#findFutureRowCount()} to determine total row count, total page count etc.
-   * </p>
-   * <p>
-   * Internally this works using {@link Query#setFirstRow(int)} and {@link Query#setMaxRows(int)} on
-   * the query. This translates into SQL that uses limit offset, rownum or row_number
-   * function to limit the result set.
-   * </p>
-   * 
-   * @param pageIndex
-   *          The zero based index of the page.
-   * @param pageSize
-   *          The number of beans to return per page.
-   * @return The PagedList
-   *
-   * @see Query#findPagedList(int, int)
-   */
-  <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction, int pageIndex, int pageSize);
-
   /**
    * Return a PagedList for this query using firstRow and maxRows.
    * <p>
diff --git a/src/main/java/com/avaje/ebean/ExpressionList.java b/src/main/java/com/avaje/ebean/ExpressionList.java
index 7c8dc93a7..d5cc62bc6 100644
--- a/src/main/java/com/avaje/ebean/ExpressionList.java
+++ b/src/main/java/com/avaje/ebean/ExpressionList.java
@@ -246,27 +246,6 @@ public interface ExpressionList<T> {
    */
   FutureList<T> findFutureList();
 
-  /**
-   * Return a PagedList for this query using pageIndex and pageSize.
-   * <p>
-   * The benefit of using this over just using the normal {@link Query#setFirstRow(int)} and
-   * {@link Query#setMaxRows(int)} is that it additionally wraps an optional call to
-   * {@link Query#findFutureRowCount()} to determine total row count, total page count etc.
-   * </p>
-   * <p>
-   * Internally this works using {@link Query#setFirstRow(int)} and {@link Query#setMaxRows(int)} on
-   * the query. This translates into SQL that uses limit offset, rownum or row_number
-   * function to limit the result set.
-   * </p>
-   * 
-   * @param pageIndex
-   *          The zero based index of the page.
-   * @param pageSize
-   *          The number of beans to return per page.
-   * @return The PagedList
-   */
-  PagedList<T> findPagedList(int pageIndex, int pageSize);
-
   /**
    * Return a PagedList for this query using firstRow and maxRows.
    * <p>
diff --git a/src/main/java/com/avaje/ebean/Model.java b/src/main/java/com/avaje/ebean/Model.java
index c9cc59db9..ab87eb41d 100644
--- a/src/main/java/com/avaje/ebean/Model.java
+++ b/src/main/java/com/avaje/ebean/Model.java
@@ -674,16 +674,6 @@ public abstract class Model {
       return query().findMap(keyProperty, keyType);
     }
 
-    /**
-     * Return a PagedList of all entities of the given type (use where() to specify predicates as
-     * needed).
-     * <p>
-     * Equivalent to {@link Query#findPagedList(int, int)}
-     */
-    public PagedList<T> findPagedList(int pageIndex, int pageSize) {
-      return query().findPagedList(pageIndex, pageSize);
-    }
-
     /**
      * Executes a find row count query in a background thread.
      * <p>
diff --git a/src/main/java/com/avaje/ebean/PagedList.java b/src/main/java/com/avaje/ebean/PagedList.java
index 97fd2c04a..22347967d 100644
--- a/src/main/java/com/avaje/ebean/PagedList.java
+++ b/src/main/java/com/avaje/ebean/PagedList.java
@@ -84,7 +84,7 @@ import java.util.concurrent.Future;
  * @param <T>
  *          the entity bean type
  * 
- * @see Query#findPagedList(int, int)
+ * @see Query#findPagedList()
  */
 public interface PagedList<T> {
 
@@ -181,15 +181,6 @@ public interface PagedList<T> {
    */
   int getTotalPageCount();
 
-  /**
-   * Return the index position of this page. Zero based.
-   * <p>
-   * Note that if firstRows/maxRows is used rather than pageIndex/pageSize then
-   * this always returns 0.
-   * </p>
-   */
-  int getPageIndex();
-
   /**
    * Return the page size used for this query. This is the same value as maxRows used by the query.
    */
diff --git a/src/main/java/com/avaje/ebean/Query.java b/src/main/java/com/avaje/ebean/Query.java
index e883ebbbb..c8266ad56 100644
--- a/src/main/java/com/avaje/ebean/Query.java
+++ b/src/main/java/com/avaje/ebean/Query.java
@@ -812,52 +812,6 @@ public interface Query<T> {
    */
   FutureList<T> findFutureList();
 
-  /**
-   * Return a PagedList for this query using pageIndex and pageSize.
-   * <p>
-   * The benefit of using this over just using the normal {@link Query#setFirstRow(int)} and
-   * {@link Query#setMaxRows(int)} is that it additionally wraps an optional call to
-   * {@link Query#findFutureRowCount()} to determine total row count, total page count etc.
-   * </p>
-   * <p>
-   * Internally this works using {@link Query#setFirstRow(int)} and {@link Query#setMaxRows(int)} on
-   * the query. This translates into SQL that uses limit offset, rownum or row_number function to
-   * limit the result set.
-   * </p>
-   *
-   * <h4>Example: typical use including total row count</h4>
-   * <pre>{@code
-   *
-   *     // We want to find the first 100 new orders
-   *     //  ... 0 means first page
-   *     //  ... page size is 100
-   *
-   *     PagedList<Order> pagedList
-   *       = ebeanServer.find(Order.class)
-   *       .where().eq("status", Order.Status.NEW)
-   *       .order().asc("id")
-   *       .findPagedList(0, 100);
-   *
-   *     // Optional: initiate the loading of the total
-   *     // row count in a background thread
-   *     pagedList.loadRowCount();
-   *
-   *     // fetch and return the list in the foreground thread
-   *     List<Order> orders = pagedList.getList();
-   *
-   *     // get the total row count (from the future)
-   *     int totalRowCount = pagedList.getTotalRowCount();
-   *
-   * }</pre>
-   *
-   * @param pageIndex
-   *          The zero based index of the page.
-   * @param pageSize
-   *          The number of beans to return per page.
-   * @return The PagedList
-   */
-  PagedList<T> findPagedList(int pageIndex, int pageSize);
-
   /**
    * Return a PagedList for this query using firstRow and maxRows.
    * <p>
diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
index 14fd8205b..91688ac80 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/DefaultServer.java
@@ -1216,12 +1216,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
     return queryFuture;
   }
 
-  @Override
-  public <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction, int pageIndex, int pageSize) {
-
-    return new LimitOffsetPagedList<T>(this, (SpiQuery<T>)query, pageIndex, pageSize);
-  }
-
   @Override
   public <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction) {
 
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 e81664a99..cf711dcc0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -292,11 +292,6 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return query.findFutureList();
   }
 
-  @Override
-  public PagedList<T> findPagedList(int pageIndex, int pageSize) {
-    return query.findPagedList(pageIndex, pageSize);
-  }
-
   @Override
   public PagedList<T> findPagedList() {
     return query.findPagedList();
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 3c03c24c5..e7d3502de 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/expression/JunctionExpression.java
@@ -359,11 +359,6 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.findMap(keyProperty, keyType);
   }
 
-  @Override
-  public PagedList<T> findPagedList(int pageIndex, int pageSize) {
-    return exprList.findPagedList(pageIndex, pageSize);
-  }
-
   @Override
   public PagedList<T> findPagedList() {
     return exprList.findPagedList();
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java b/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java
index 3a61112e6..9906ac223 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/LimitOffsetPagedList.java
@@ -25,8 +25,6 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
 
   private final int maxRows;
 
-  private final int pageIndex;
-
   private final Monitor monitor = new Monitor();
 
   private int foregroundTotalRowCount = -1;
@@ -35,20 +33,6 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
 
   private List<T> list;
 
-  /**
-   * Construct with pageIndex/pageSize.
-   */
-  public LimitOffsetPagedList(EbeanServer server, SpiQuery<T> query, int pageIndex, int pageSize) {
-    this.server = server;
-    this.query = query;
-    this.maxRows = pageSize;
-    this.firstRow = pageIndex * pageSize;
-    this.pageIndex = pageIndex;
-
-    query.setFirstRow(firstRow);
-    query.setMaxRows(pageSize);
-  }
-
   /**
    * Construct with firstRow/maxRows.
    */
@@ -57,7 +41,6 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
     this.query = query;
     this.maxRows = query.getMaxRows();
     this.firstRow = query.getFirstRow();
-    this.pageIndex = 0;
   }
 
   public void loadRowCount() {
@@ -119,10 +102,6 @@ public class LimitOffsetPagedList<T> implements PagedList<T> {
     return firstRow > 0;
   }
 
-  public int getPageIndex() {
-    return pageIndex;
-  }
-
   public int getPageSize() {
     return maxRows;
   }
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 6e463c093..6765f5398 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1126,11 +1126,6 @@ public class DefaultOrmQuery<T> implements SpiQuery<T> {
     return server.findFutureRowCount(this, null);
   }
 
-  @Override
-  public PagedList<T> findPagedList(int pageIndex, int pageSize) {
-    return server.findPagedList(this, null, pageIndex, pageSize);
-  }
-
   @Override
   public PagedList<T> findPagedList() {
     return server.findPagedList(this, null);
diff --git a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
index 62e52ad2d..d6c35b7f5 100644
--- a/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
+++ b/src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
@@ -475,11 +475,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
     return null;
   }
 
-  @Override
-  public <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction, int pageIndex, int pageSize) {
-    return null;
-  }
-
   @Override
   public <T> PagedList<T> findPagedList(Query<T> query, Transaction transaction) {
     return null;
diff --git a/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java b/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java
index 6f29be538..d07567931 100644
--- a/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java
+++ b/src/test/java/com/avaje/tests/compositekeys/TestCKeyLazyLoad.java
@@ -90,7 +90,8 @@ public class TestCKeyLazyLoad extends BaseTestCase {
 
     PagedList<CKeyParent> siteUserPage = Ebean.find(CKeyParent.class).where()
         .orderBy("name asc")
-        .findPagedList(0, 10);
+        .setMaxRows(10)
+        .findPagedList();
     siteUserPage.getList();
   }
 }
diff --git a/src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java b/src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
index f22855c32..0f94b37a4 100644
--- a/src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
+++ b/src/test/java/com/avaje/tests/query/TestAddOrderByWithFirstRowsMaxRows.java
@@ -101,7 +101,8 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
 
     PagedList<Order> pagedList =
         Ebean.find(Order.class)
-        .findPagedList(0, 10);
+          .setMaxRows(10)
+          .findPagedList();
 
     pagedList.getList();
 
@@ -119,7 +120,9 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
     LoggedSqlCollector.start();
 
     Ebean.find(Order.class)
-        .findPagedList(1, 10)
+        .setFirstRow(10)
+        .setMaxRows(10)
+        .findPagedList()
         .getList();
 
     List<String> loggedSql = LoggedSqlCollector.stop();
@@ -138,7 +141,8 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
 
     Ebean.find(Order.class)
         .order().asc("orderDate")
-        .findPagedList(0, 10)
+        .setMaxRows(10)
+        .findPagedList()
         .getList();
 
     List<String> loggedSql = LoggedSqlCollector.stop();
@@ -157,7 +161,8 @@ public class TestAddOrderByWithFirstRowsMaxRows extends BaseTestCase {
     Ebean.find(Order.class)
         .order().asc("orderDate")
         .order().desc("id")
-        .findPagedList(0, 10)
+        .setMaxRows(10)
+        .findPagedList()
         .getList();
 
     List<String> loggedSql = LoggedSqlCollector.stop();
diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java b/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java
index 54796941a..501136f8c 100644
--- a/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java
+++ b/src/test/java/com/avaje/tests/query/TestQueryFindPagedList.java
@@ -142,7 +142,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    PagedList<Order> pagedList = Ebean.find(Order.class).findPagedList(0, 4);
+    PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(4).findPagedList();
 
     LoggedSqlCollector.start();
 
@@ -159,7 +159,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    PagedList<Order> pagedList = Ebean.find(Order.class).findPagedList(0, 3);
+    PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(3).findPagedList();
 
     Future<Integer> rowCount = pagedList.getFutureRowCount();
     List<Order> orders = pagedList.getList();
@@ -181,7 +181,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
     ResetBasicData.reset();
 
     // fetch less that total orders (page size 3)
-    PagedList<Order> pagedList = Ebean.find(Order.class).findPagedList(0, 3);
+    PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(3).findPagedList();
 
     pagedList.loadRowCount();
     List<Order> orders = pagedList.getList();
@@ -196,7 +196,7 @@ public class TestQueryFindPagedList extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    PagedList<Order> pagedList = Ebean.find(Order.class).findPagedList(0, 6);
+    PagedList<Order> pagedList = Ebean.find(Order.class).setMaxRows(6).findPagedList();
 
     LoggedSqlCollector.start();
 
@@ -237,7 +237,8 @@ public class TestQueryFindPagedList extends BaseTestCase {
     PagedList<Order> pagedList = Ebean.find(Order.class)
         .alias("b")
         .where().raw("b.id > 0")
-        .findPagedList(0, 6);
+        .setMaxRows(6)
+        .findPagedList();
 
     LoggedSqlCollector.start();
 
diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java
index eebfc587e..9f1b23097 100644
--- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java
+++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmQuery.java
@@ -93,7 +93,7 @@ public class TestRawSqlOrmQuery extends BaseTestCase {
     
     int initialRowCount = query.findRowCount();
     
-    PagedList<Customer> page = query.findPagedList(0, 2);
+    PagedList<Customer> page = query.setMaxRows(2).findPagedList();
 
     List<Customer> list = page.getList();
     int rowCount = page.getTotalRowCount();