rename removeMessage to discardMessage, complete SIP