controller, routes cleanup