remove admin page, refactoring