Cleaning up messaging related stuff.