Cleanup pager code