Tidy up the whisper system to properly use new channels