Remove unnecessary '!= 1' in conditions