remove unnecessary Channel.* and SenderBuffer.*