Remove unused module, simplify route