Cleaning up TBD, comments