Bug fixes for paging, removed redundant file