Remove TODOs that are not needed

Change-Id: Ica755eba23d05d53c6b134d740ce4c696bde76c1
Merge "Remove TODOs that are not needed"