Cleanup and route fixes