refactor and remove more pages