diff --git a/frontend/src/component/common/NewConstraintAccordion/NewConstraintAccordionList/NewConstraintAccordionList.tsx b/frontend/src/component/common/NewConstraintAccordion/NewConstraintAccordionList/NewConstraintAccordionList.tsx
index 6357ed6a33..e574248c67 100644
--- a/frontend/src/component/common/NewConstraintAccordion/NewConstraintAccordionList/NewConstraintAccordionList.tsx
+++ b/frontend/src/component/common/NewConstraintAccordion/NewConstraintAccordionList/NewConstraintAccordionList.tsx
@@ -153,10 +153,6 @@ export const NewConstraintAccordionList = forwardRef<
                                 constraint={constraint}
                                 onCancel={onCancel?.bind(null, index)}
                                 onDelete={onRemove?.bind(null, index)}
-                                onSave={onSave!.bind(null, index)}
-                                onAutoSave={onAutoSave?.(
-                                    constraint[constraintId],
-                                )}
                             />
                         ) : (
                             <ConstraintAccordionView
diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraint.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraint.tsx
index 25955cd10c..6aead7374c 100644
--- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraint.tsx
+++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraint.tsx
@@ -176,7 +176,6 @@ const getInputType = (input: Input): InputType => {
 };
 
 type Props = {
-    constraint: IConstraint;
     localConstraint: IConstraint;
     setContextName: (contextName: string) => void;
     setOperator: (operator: Operator) => void;
@@ -184,26 +183,20 @@ type Props = {
     onDelete?: () => void;
     toggleInvertedOperator: () => void;
     toggleCaseSensitivity: () => void;
-    onUndo: () => void;
-    constraintChanges: IConstraint[];
     contextDefinition: Pick<IUnleashContextDefinition, 'legalValues'>;
     constraintValues: string[];
     constraintValue: string;
     setValue: (value: string) => void;
     setValues: (values: string[]) => void;
-    setValuesWithRecord: (values: string[]) => void;
     removeValue: (index: number) => void;
 };
 
 export const EditableConstraint: FC<Props> = ({
-    constraintChanges,
-    constraint,
     localConstraint,
     setLocalConstraint,
     setContextName,
     setOperator,
     onDelete,
-    onUndo,
     toggleInvertedOperator,
     toggleCaseSensitivity,
     contextDefinition,
@@ -211,7 +204,6 @@ export const EditableConstraint: FC<Props> = ({
     constraintValue,
     setValue,
     setValues,
-    setValuesWithRecord,
     removeValue,
 }) => {
     const { input } = useConstraintInput({
@@ -324,7 +316,7 @@ export const EditableConstraint: FC<Props> = ({
                                 ...(localConstraint.values || []),
                                 ...newValues,
                             ]);
-                            setValuesWithRecord(Array.from(combinedValues));
+                            setValues(Array.from(combinedValues));
                         }}
                     />
                 );
@@ -399,7 +391,7 @@ export const EditableConstraint: FC<Props> = ({
                     <ValueList
                         values={localConstraint.values}
                         removeValue={removeValue}
-                        setValues={setValuesWithRecord}
+                        setValues={setValues}
                         getExternalFocusTarget={() =>
                             addValuesButtonRef.current ??
                             deleteButtonRef.current
@@ -430,7 +422,7 @@ export const EditableConstraint: FC<Props> = ({
                         )}
                         constraintValues={constraintValues}
                         values={localConstraint.values || []}
-                        setValuesWithRecord={setValuesWithRecord}
+                        setValuesWithRecord={setValues}
                         setValues={setValues}
                     />
                 </LegalValuesContainer>
diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraintWrapper.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraintWrapper.tsx
index 44f2b6a483..2b857955ea 100644
--- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraintWrapper.tsx
+++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyConstraints/EditableConstraintWrapper.tsx
@@ -118,6 +118,7 @@ export const EditableConstraintWrapper = ({
         (index: number) => {
             const valueCopy = [...localConstraint.values!];
             valueCopy.splice(index, 1);
+            setValues(valueCopy);
         },
         [localConstraint],
     );
@@ -131,15 +132,12 @@ export const EditableConstraintWrapper = ({
             toggleInvertedOperator={setInvertedOperator}
             toggleCaseSensitivity={setCaseInsensitive}
             onDelete={onDelete}
-            constraintChanges={constraintChanges}
             setValues={setValues}
-            setValuesWithRecord={setValuesWithRecord}
             setValue={setValue}
             constraintValues={constraint?.values || []}
             constraintValue={constraint?.value || ''}
             contextDefinition={contextDefinition}
             removeValue={removeValue}
-            constraint={constraint}
         />
     );
 };