ChannelSelection: cleanup some code - pure cosmetic