cleaning up messaging