Clean up routing and path generation