Clean up todo

Change-Id: Idc561ad2fa32ec6d542eb4acf54e17a999a1928c