Initial work on disabling plugins per channel.
Cleanup