Remove unnecessary conditions and fix oc