Constraints updated to remove AEC/AGC