I'd say either do the TODO, or remove the TODO