diff --git a/src/common/index.js b/src/common/index.js
index 9ce9476b5..38ce7ab6c 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -32,9 +32,7 @@ const routesRegexp = require('./routesRegexp');
 const sanitizeLocationPath = require('./sanitizeLocationPath');
 const useAnimationFrame = require('./useAnimationFrame');
 const useBinaryState = require('./useBinaryState');
-const useDeepEqualEffect = require('./useDeepEqualEffect');
 const useDeepEqualMemo = require('./useDeepEqualMemo');
-const useDeepEqualState = require('./useDeepEqualState');
 const useFullscreen = require('./useFullscreen');
 const useLiveRef = require('./useLiveRef');
 const useModelState = require('./useModelState');
@@ -78,9 +76,7 @@ module.exports = {
     sanitizeLocationPath,
     useAnimationFrame,
     useBinaryState,
-    useDeepEqualEffect,
     useDeepEqualMemo,
-    useDeepEqualState,
     useFullscreen,
     useLiveRef,
     useModelState,
diff --git a/src/common/useDeepEqualEffect.js b/src/common/useDeepEqualEffect.js
deleted file mode 100644
index 095576356..000000000
--- a/src/common/useDeepEqualEffect.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (C) 2017-2022 Smart code 203358507
-
-const React = require('react');
-const useDeepEqualMemo = require('stremio/common/useDeepEqualMemo');
-
-const useDeepEqualEffect = (cb, deps) => {
-    React.useEffect(cb, [useDeepEqualMemo(() => ({}), deps)]);
-};
-
-module.exports = useDeepEqualEffect;
diff --git a/src/common/useDeepEqualState.js b/src/common/useDeepEqualState.js
deleted file mode 100644
index edd762b46..000000000
--- a/src/common/useDeepEqualState.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (C) 2017-2022 Smart code 203358507
-
-const React = require('react');
-const isEqual = require('lodash.isequal');
-
-const useDeepEqualState = (initialState) => {
-    return React.useReducer(
-        (prevState, nextState) => {
-            return isEqual(prevState, nextState) ?
-                prevState
-                :
-                nextState;
-        },
-        undefined,
-        () => {
-            return typeof initialState === 'function' ?
-                initialState()
-                :
-                initialState;
-        }
-    );
-};
-
-module.exports = useDeepEqualState;
diff --git a/src/routes/Settings/useProfileSettingsInputs.js b/src/routes/Settings/useProfileSettingsInputs.js
index 5534fd6e4..57f444d01 100644
--- a/src/routes/Settings/useProfileSettingsInputs.js
+++ b/src/routes/Settings/useProfileSettingsInputs.js
@@ -5,6 +5,7 @@ const { CONSTANTS, languageNames, useDeepEqualMemo } = require('stremio/common')
 
 const useProfileSettingsInputs = (profile) => {
     const { core } = useServices();
+    // TODO combine those useDeepEqualMemo in one
     const interfaceLanguageSelect = useDeepEqualMemo(() => ({
         options: Object.keys(languageNames).map((code) => ({
             value: code,
diff --git a/src/routes/Settings/useStreamingServerSettingsInputs.js b/src/routes/Settings/useStreamingServerSettingsInputs.js
index 0318d0f49..608a8390e 100644
--- a/src/routes/Settings/useStreamingServerSettingsInputs.js
+++ b/src/routes/Settings/useStreamingServerSettingsInputs.js
@@ -45,6 +45,7 @@ const TORRENT_PROFILES = {
 
 const useStreamingServerSettingsInputs = (streamingServer) => {
     const { core } = useServices();
+    // TODO combine those useDeepEqualMemo in one
     const cacheSizeSelect = useDeepEqualMemo(() => {
         if (streamingServer.settings === null || streamingServer.settings.type !== 'Ready') {
             return null;