Remove unused templates/routes and refactoring some others