> Let's just have something to remove the message from the various Maps when we delete it.

Ok