Cleaning up routes and points