Remove unused code
Fix missing route