Cleaning up messaging around playing and streaming