channels: partial cleanup