deactivateChannelWithId added for removing channels.
Backed out regression