and the rest of the routes clean up