Cleaning up some routes