fix(router): Remove redundancies