Clean up API routers; adjust endpoint async connectors to return a new channel