Remove addressed TODO comment