cleanup and router
Revert "cleanup and router"

This reverts commit 0426c362098eb0245a776c7535dfdda57f2dc219.