remove adder & scaler from constraint