diff --git a/src/components/views/settings/EventIndexPanel.js b/src/components/views/settings/EventIndexPanel.js
index fd3facbc6b..8ed4b114e7 100644
--- a/src/components/views/settings/EventIndexPanel.js
+++ b/src/components/views/settings/EventIndexPanel.js
@@ -15,16 +15,10 @@ limitations under the License.
 */
 
 import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
 
-import * as sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import AccessibleButton from "../elements/AccessibleButton";
-import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
-import Field from "../elements/Field";
 import {formatBytes} from "../../../utils/FormattingUtils";
 import EventIndexPeg from "../../../indexing/EventIndexPeg";
 
@@ -83,7 +77,6 @@ export default class EventIndexPanel extends React.Component {
                 onFinished: () => {},
             }, null, /* priority = */ false, /* static = */ true,
         );
-
     }
 
     render() {
@@ -111,7 +104,7 @@ export default class EventIndexPanel extends React.Component {
                     {
                         _t( "Riot can't securely cache encrypted messages locally" +
                             "while running in a web browser. Use Riot Desktop for" +
-                            "encrypted messages to appear in search results."
+                            "encrypted messages to appear in search results.",
                         )
                     }
                 </div>
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
index 8cbaba037d..bd1b7c2ca4 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
@@ -23,7 +23,6 @@ import SettingsStore from "../../../../../settings/SettingsStore";
 import Field from "../../../elements/Field";
 import * as sdk from "../../../../..";
 import PlatformPeg from "../../../../../PlatformPeg";
-import {formatBytes} from "../../../../../utils/FormattingUtils";
 
 export default class PreferencesUserSettingsTab extends React.Component {
     static COMPOSER_SETTINGS = [
diff --git a/src/indexing/EventIndex.js b/src/indexing/EventIndex.js
index 5676636eed..435f67447d 100644
--- a/src/indexing/EventIndex.js
+++ b/src/indexing/EventIndex.js
@@ -470,8 +470,8 @@ export default class EventIndex {
     /**
      * Get the room that we are currently crawling.
      *
-     * @returns A MatrixRoom that is being currently crawled, null if no room is
-     * currently being crawled.
+     * @returns {Room} A MatrixRoom that is being currently crawled, null
+     * if no room is currently being crawled.
      */
     currentRoom() {
         if (this._currentCheckpoint === null && this.crawlerCheckpoints.length === 0) {