OneOrMore option - remove unnecessary conditions