Cleaned things up a bit, cleared out channels when removed, etc