Clean Up After Your Messenger