Change removal of channels to support new channel state

Rename: myUser -> client