Remove debug code
Pagination redesign