Remove some obsolete TODOs

Test: builds
Change-Id: I60f47a48907ae41573a7ad994a9c53010e2d7ac1
2 files changed