Remove unused code from Routes refactor