messaging clean up