Remove addressed TODO