Clean up code flow in `ChannelManager`