Removed refs to deleted code. Added additional xref exceptions.