Removing unused variables, adding Paginator\QueryBuilder