[Router] Cleanup

Removed unused imports, variables, arguments.