Remove will paginate

Also moved around some code