Conditions simplify

Remove some redundant conditions. No functional change.