Remove yoda condition