diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordion.styles.ts b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordion.styles.ts
index f208f27ee7..0aa5b91745 100644
--- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordion.styles.ts
+++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordion.styles.ts
@@ -49,7 +49,7 @@ export const useStyles = makeStyles()(theme => ({
     headerValuesContainerWrapper: {
         display: 'flex',
         flexDirection: 'row',
-        justifyContent: 'center'
+        justifyContent: 'center',
     },
     headerValuesContainer: {
         display: 'flex',
diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ConstraintAccordionEditBody.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ConstraintAccordionEditBody.tsx
index 4058690ba5..ebfcb4d3a9 100644
--- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ConstraintAccordionEditBody.tsx
+++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ConstraintAccordionEditBody.tsx
@@ -1,8 +1,7 @@
-import { Button, FormControlLabel, Switch } from '@mui/material';
+import { Button } from '@mui/material';
 import { IConstraint } from 'interfaces/strategy';
 import { CANCEL } from '../ConstraintAccordionEdit';
 
-import { ConstraintFormHeader } from './ConstraintFormHeader/ConstraintFormHeader';
 import { useStyles } from './ConstraintAccordionEditBody.styles';
 import React from 'react';
 import { newOperators } from 'constants/operators';
diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ResolveInput/ResolveInput.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ResolveInput/ResolveInput.tsx
index 8fd61494de..a957d1df4e 100644
--- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ResolveInput/ResolveInput.tsx
+++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditBody/ResolveInput/ResolveInput.tsx
@@ -1,6 +1,5 @@
 import { IUnleashContextDefinition } from 'interfaces/context';
 import { IConstraint } from 'interfaces/strategy';
-import { CaseInsensitive } from '../CaseInsensitive/CaseInsensitive';
 import { DateSingleValue } from '../DateSingleValue/DateSingleValue';
 import { FreeTextInput } from '../FreeTextInput/FreeTextInput';
 import { RestrictiveLegalValues } from '../RestrictiveLegalValues/RestrictiveLegalValues';
diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader.tsx
index 2ef2de188c..4761cb9601 100644
--- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader.tsx
+++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/ConstraintAccordionEditHeader/ConstraintAccordionEditHeader.tsx
@@ -4,7 +4,7 @@ import { useStyles } from 'component/common/ConstraintAccordion/ConstraintAccord
 import useUnleashContext from 'hooks/api/getters/useUnleashContext/useUnleashContext';
 import GeneralSelect from 'component/common/GeneralSelect/GeneralSelect';
 import { ConstraintIcon } from 'component/common/ConstraintAccordion/ConstraintIcon';
-import { Delete, Edit, Help } from '@mui/icons-material';
+import { Delete, Edit } from '@mui/icons-material';
 import { ConditionallyRender } from 'component/common/ConditionallyRender/ConditionallyRender';
 import {
     dateOperators,
diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/StyledToggleButton/InvertedOperatorButton/InvertedOperatorButton.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/StyledToggleButton/InvertedOperatorButton/InvertedOperatorButton.tsx
index 32d37c9dae..b05667b4d0 100644
--- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/StyledToggleButton/InvertedOperatorButton/InvertedOperatorButton.tsx
+++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionEdit/StyledToggleButton/InvertedOperatorButton/InvertedOperatorButton.tsx
@@ -1,7 +1,7 @@
-import { Button, IconButton, Tooltip } from '@mui/material';
+import { Tooltip } from '@mui/material';
 import { ReactComponent as NegatedIcon } from '../../../../../../assets/icons/24_Negator.svg';
 import { ReactComponent as NegatedIconOff } from '../../../../../../assets/icons/24_Negator off.svg';
-import React, { useMemo } from 'react';
+import React from 'react';
 import { IConstraint } from '../../../../../../interfaces/strategy';
 import {
     StyledToggleButtonOff,
diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx
index c266cb1f43..f068f2aa82 100644
--- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx
+++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx
@@ -1,5 +1,4 @@
 import { Accordion, AccordionSummary, AccordionDetails } from '@mui/material';
-import { ExpandMore } from '@mui/icons-material';
 import { IConstraint } from 'interfaces/strategy';
 
 import { ConstraintAccordionViewBody } from './ConstraintAccordionViewBody/ConstraintAccordionViewBody';
diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewHeader/ConstraintAccordionViewHeader.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewHeader/ConstraintAccordionViewHeader.tsx
index cc0f9d9db4..69d682ea08 100644
--- a/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewHeader/ConstraintAccordionViewHeader.tsx
+++ b/frontend/src/component/common/ConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewHeader/ConstraintAccordionViewHeader.tsx
@@ -53,19 +53,20 @@ const StyledSingleValueChip = styled(Chip)(({ theme }) => ({
     },
 }));
 
-const StyledIconWrapper = styled('div')<{ marginRight?: string, marginTop?: string  }>(
-    ({ theme, marginRight, marginTop }) => ({
-        backgroundColor: theme.palette.grey[200],
-        width: 28,
-        height: 47,
-        display: 'inline-flex',
-        justifyContent: 'center',
-        padding: '10px 0',
-        color: theme.palette.primary.main,
-        marginRight: marginRight ? marginRight : '0.75rem',
-        marginTop: marginTop ? marginTop: 0
-    })
-);
+const StyledIconWrapper = styled('div')<{
+    marginRight?: string;
+    marginTop?: string;
+}>(({ theme, marginRight, marginTop }) => ({
+    backgroundColor: theme.palette.grey[200],
+    width: 28,
+    height: 47,
+    display: 'inline-flex',
+    justifyContent: 'center',
+    padding: '10px 0',
+    color: theme.palette.primary.main,
+    marginRight: marginRight ? marginRight : '0.75rem',
+    marginTop: marginTop ? marginTop : 0,
+}));
 
 interface IConstraintAccordionViewHeaderProps {
     compact: boolean;
@@ -208,8 +209,10 @@ export const ConstraintAccordionViewHeader = ({
                                                 'valuesExpandLabel'
                                             )}
                                         >
-                                            {!expanded ? `Expand to view all (
-                                            ${constraint?.values?.length})` : 'Collapse to view less' }
+                                            {!expanded
+                                                ? `Expand to view all (
+                                            ${constraint?.values?.length})`
+                                                : 'Collapse to view less'}
                                         </p>
                                     }
                                 />
diff --git a/frontend/src/component/common/ConstraintAccordion/ConstraintOperator/ConstraintOperator.tsx b/frontend/src/component/common/ConstraintAccordion/ConstraintOperator/ConstraintOperator.tsx
index c275825059..b21c6159a1 100644
--- a/frontend/src/component/common/ConstraintAccordion/ConstraintOperator/ConstraintOperator.tsx
+++ b/frontend/src/component/common/ConstraintAccordion/ConstraintOperator/ConstraintOperator.tsx
@@ -1,9 +1,6 @@
 import { IConstraint } from 'interfaces/strategy';
 import { formatOperatorDescription } from 'component/common/ConstraintAccordion/ConstraintOperator/formatOperatorDescription';
 import { useStyles } from 'component/common/ConstraintAccordion/ConstraintOperator/ConstraintOperator.styles';
-import { ConditionallyRender } from '../../ConditionallyRender/ConditionallyRender';
-import { ReactComponent as NegatedIcon } from '../../../../assets/icons/24_Negator.svg';
-import { colors } from '../../../../themes/colors';
 import React from 'react';
 
 interface IConstraintOperatorProps {