Remove these 2 channels, as they were only used in testing and
complicate things if we want to do a clean stop()

Less is more.