cleaned up routers