Issue #1157234, by solotandem and KarenS, additional fix that got left out of...

Issue #1157234, by solotandem and KarenS, additional fix that got left out of earlier commit, remove unneeded clause testing for values that were removed earlier in the process.