simplify router
remove deadcode
sync
sync
fix travis build