Cleanup and route fixing