Get rid of some obsolete TODOs

Change-Id: Ia630432eb94eca36f4e9ab64283503988c14f972
Merge "Get rid of some obsolete TODOs"