add cleanup for MessagePasser