clean up messaging flow