Remove TODO, code is not being used.