Correct constraints and remove label