diff --git a/frontend/src/components/StatementWithProvenances.tsx b/frontend/src/components/StatementWithProvenances.tsx
index bd2ef5c1..bf95a7f4 100644
--- a/frontend/src/components/StatementWithProvenances.tsx
+++ b/frontend/src/components/StatementWithProvenances.tsx
@@ -1,7 +1,6 @@
 import React  from "react";
 import {Box} from "@mui/material";
 import StatementForm from "./Forms/StatementForm";
-import ProvenancesForm from "./Forms/ProvenanceForm";
 
 const StatementWithProvenances = ({ statement, background = "#fff", refreshStatement, isDisabled } : any) => {
 
diff --git a/frontend/src/components/Widgets/CustomEntitiesDropdown.tsx b/frontend/src/components/Widgets/CustomEntitiesDropdown.tsx
index fb887e0b..93c73de6 100644
--- a/frontend/src/components/Widgets/CustomEntitiesDropdown.tsx
+++ b/frontend/src/components/Widgets/CustomEntitiesDropdown.tsx
@@ -18,7 +18,6 @@ import {
 } from "@mui/material";
 import {CheckedItemIcon, CheckedItemIconBG, UncheckedItemIcon} from "../icons";
 import HoveredOptionContent from "./HoveredOptionContent";
-import ClearOutlinedIcon from "@mui/icons-material/ClearOutlined";
 import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
 import ArrowDropUpIcon from "@mui/icons-material/ArrowDropUp";
 import theme from "../../theme/Theme";
@@ -854,4 +853,4 @@ export default function CustomEntitiesDropdown({
       )}
     </>
   );
-}
\ No newline at end of file
+}
diff --git a/frontend/src/components/Widgets/CustomGroupedButtons.tsx b/frontend/src/components/Widgets/CustomGroupedButtons.tsx
index 8ea777d1..6d7f472a 100644
--- a/frontend/src/components/Widgets/CustomGroupedButtons.tsx
+++ b/frontend/src/components/Widgets/CustomGroupedButtons.tsx
@@ -9,7 +9,7 @@ import MenuList from "@mui/material/MenuList";
 import MenuItem from "@mui/material/MenuItem";
 import FormControl from "@mui/material/FormControl";
 
-export default function GroupedButtons({handleClick, selectedOption, options, selectedIndex, handleMenuItemClick , hasFormat = false, format, disabled}: any) {
+export default function GroupedButtons({handleClick, selectedOption, options, selectedIndex, handleMenuItemClick , hasFormat = false, format, isDisabled}: any) {
   const anchorRef = React.useRef<HTMLDivElement>(null);
   const [open, setOpen] = React.useState(false);
 
@@ -31,7 +31,7 @@ export default function GroupedButtons({handleClick, selectedOption, options, se
 
   return (
     <FormControl>
-      <ButtonGroup variant="contained" ref={anchorRef} disabled={disabled}>
+      <ButtonGroup variant="contained" ref={anchorRef} disabled={isDisabled}>
         <Button onClick={handleClick}>{selectedOption}</Button>
         <Button
           size="small"
@@ -40,6 +40,7 @@ export default function GroupedButtons({handleClick, selectedOption, options, se
           aria-label="select merge strategy"
           aria-haspopup="menu"
           onClick={handleToggle}
+          disabled={options?.length > 0 ? false : true}
         >
           <ArrowDropDownIcon />
         </Button>
@@ -65,7 +66,7 @@ export default function GroupedButtons({handleClick, selectedOption, options, se
             <Paper sx={{p:3}}>
               <ClickAwayListener onClickAway={handleClose}>
                 <MenuList id="split-button-menu" autoFocusItem>
-                  {options.map((option: string, index: number) => (
+                  {options?.map((option: string, index: number) => (
                     <MenuItem
                       key={option}
                       selected={index === selectedIndex}
diff --git a/frontend/src/components/Widgets/TextfieldWithChips.tsx b/frontend/src/components/Widgets/TextfieldWithChips.tsx
index 87ce8174..6266e883 100644
--- a/frontend/src/components/Widgets/TextfieldWithChips.tsx
+++ b/frontend/src/components/Widgets/TextfieldWithChips.tsx
@@ -2,9 +2,6 @@ import React from "react";
 import TextField from "@mui/material/TextField";
 import FormControl from "@mui/material/FormControl";
 import { Autocomplete, styled } from "@mui/material";
-import Chip from "@mui/material/Chip";
-import ClearOutlinedIcon from "@mui/icons-material/ClearOutlined";
-import { vars } from "../../theme/variables";
 import Box from "@mui/material/Box";
 import CustomTextFieldChip from "./CustomTextFieldChip";