Remove obsolete TODOs

Change-Id: I98a1890a683ef65563e9bddbc8f2aee2f4f6c247