Cleanup
Fix routes