clean up main controller and routes