Remove unused code, simplify routes