Router: remove old code