Refactor, remove unused pages and methods