Cleaning up some obsolete TODOs and methods

Change-Id: I7c3f1a68fc555899e6a1270aa2ad973197a7ed85
1 file changed