diff --git a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
index 6d0f9a43e8..064f55edc0 100644
--- a/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/DisableEventIndex.js
@@ -21,9 +21,6 @@ import dis from "../../../../dispatcher";
 import { _t } from '../../../../languageHandler';
 
 import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
-import LabelledToggleSwitch from "../../../../components/views/elements/LabelledToggleSwitch";
-import Field from "../../../../components/views/elements/Field";
-import {formatBytes} from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
 
@@ -50,7 +47,6 @@ export default class ManageEventIndex extends React.Component {
             disabling: true,
         });
 
-        const eventIndex = EventIndexPeg.get();
         await SettingsStore.setValue('enableEventIndexing', null, SettingLevel.DEVICE, false);
         await EventIndexPeg.deleteEventIndex();
         this.props.onFinished();
@@ -59,7 +55,7 @@ export default class ManageEventIndex extends React.Component {
 
     render() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const DialogButtons = sdk.getComponent("views.elements.DialogButtons");
+        const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
 
         return (
             <BaseDialog className='mx_ManageEventIndexDialog'
diff --git a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
index b53b4810aa..d0f3c2cf50 100644
--- a/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
+++ b/src/async-components/views/dialogs/eventindex/ManageEventIndex.js
@@ -20,9 +20,6 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../../languageHandler';
 
 import Modal from '../../../../Modal';
-import SettingsStore, {SettingLevel} from "../../../../settings/SettingsStore";
-import LabelledToggleSwitch from "../../../../components/views/elements/LabelledToggleSwitch";
-import Field from "../../../../components/views/elements/Field";
 import {formatBytes} from "../../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../../indexing/EventIndexPeg";
 import AccessibleButton from "../../../../components/views/elements/AccessibleButton";
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 6d38f1683f..d466c6acba 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -16,8 +16,6 @@ limitations under the License.
 
 import PlatformPeg from "../PlatformPeg";
 import {MatrixClientPeg} from "../MatrixClientPeg";
-import SettingsStore from '../settings/SettingsStore';
-import {SettingLevel} from "../settings/SettingsStore";
 import {sleep} from "../utils/promise";
 import {EventEmitter} from "events";