further cleanup of paging machinery