Remove redundant comparisons in conditions