more specific routes and cleanup