Inconsistent comment: 'TODO: XXX' that's already done