removing channel-specific mapping stuff since it's not usable in the way I thought it was