Remove XXX comments that did not apply.