messaging clean up 2