Remove some obsolete TODO comments, fix indentation.

Test: Rely on TreeHugger.
Change-Id: I4e3c0ba13d576ef62121d47ebc4965f6667b624f
11 files changed