Remove voided references in statement properties and discussion