Removed old-router
Merge pull request #3067 from machty/remove-old-router

Removed old-router