Clean up special routing for commands to routers with errors

fixed