channel: remove redundant state checks
messages: remove redundant state check