Cleaning up obsolete TODOs and minor style changes

Change-Id: Ic5d7dbbec7d96b50df094394aabaa4c30de5f2c5
Merge "Cleaning up obsolete TODOs and minor style changes"