removing some TODOs

Change-Id: Ic98c811573a1b37813993eedddec512ec85729f3
35 files changed