Refactor the controllers to cleanup after the homepage_controller was added