Remove spurious TODO comments

uuid is being used and the field is indicated in the message