unnecessary conditions removed