Clean up routes and remove helper