Build #25929412505:   removing TODOs and unnecessary comments on branch cecilia-1344 6 days ago