Removed references to channels in all classes, put them in Deprecated group.