Revert "Remove code smells from router"

This reverts commit 1551fe9e163c6b56594740b245ab1156e7e1d9c6.
ignoring binstubs