Remove some TODOs and imports

Change-Id: If6e693569a89201bce2bfcf481ece6812e30906e
1 file changed