Clean up some routes and gems