Properly clear the extra ChannelsPerOrder entries