diff --git a/src/components/Searchkit/CustomESRequestSerializer.jsx b/src/components/Searchkit/CustomESRequestSerializer.jsx
index 83614136..34ecd076 100644
--- a/src/components/Searchkit/CustomESRequestSerializer.jsx
+++ b/src/components/Searchkit/CustomESRequestSerializer.jsx
@@ -115,7 +115,7 @@ export class CustomESRequestSerializer {
         return;
       }
 
-      // TODO Words with hyphen
+      // Words with hyphen
       let word_new;
       let wordpartlist = word.split('-'); // common hyphens
       if (wordpartlist.length > 1) {
diff --git a/src/components/Searchkit/CustomESResponseSerializer.jsx b/src/components/Searchkit/CustomESResponseSerializer.jsx
index 41207bcf..0127f51f 100644
--- a/src/components/Searchkit/CustomESResponseSerializer.jsx
+++ b/src/components/Searchkit/CustomESResponseSerializer.jsx
@@ -1,18 +1,4 @@
-// TODO add data of .title to serialized response
-// aggregations.organisationunit_agg.organisationunit_token.buckets[1].somemoredatafromelasticsearch.hits.hits[0]._source.title
-
 import { forEach, has } from 'lodash';
-import {
-  addAppURL,
-  isInternalURL,
-  flattenToAppURL,
-  expandToBackendURL,
-  getAuthToken,
-} from '@plone/volto/helpers';
-
-import { flattenESUrlToPath } from '../helpers';
-
-import config from '@plone/volto/registry';
 
 function _pimpedAggregations(aggregations) {
   let result = Object.assign({}, aggregations);
diff --git a/src/components/Views/FacetedSearch.jsx b/src/components/Views/FacetedSearch.jsx
index 41bf4e3e..516eab1b 100644
--- a/src/components/Views/FacetedSearch.jsx
+++ b/src/components/Views/FacetedSearch.jsx
@@ -1,4 +1,3 @@
-// TODO update counts of BucketAggregation on selection of filter
 // TODO lacales actionProps, placeholder
 import React from 'react';
 import { useSelector } from 'react-redux';