Also remove the reference to a patch that was removed in a prior commit. This includes improvements to simplification wrt attribute metric for certain edge cases.