diff --git a/headless/index.js b/headless/index.js
index e5b9ceae8..bba890267 100644
--- a/headless/index.js
+++ b/headless/index.js
@@ -21,7 +21,7 @@ import {listDevices} from '../src/utils/listDevices';
 // $FlowFixMe this file exist, trust me, flow!
 import setup from '../static/setup.js';
 import type {Store} from '../src/reducers/index.tsx';
-import {getPersistentPlugins} from '../src/utils/pluginUtils.js';
+import {getPersistentPlugins} from '../src/utils/pluginUtils.tsx';
 import {serialize} from '../src/utils/serialization';
 import type BaseDevice from '../src/devices/BaseDevice.tsx';
 
@@ -312,7 +312,6 @@ async function startFlipper(userArguments: UserArguments) {
           if (matchedDevice) {
             if (matchedDevice.constructor.name === 'AndroidDevice') {
               const ports = store.getState().application.serverPorts;
-              //$FlowFixMe: Checked the class name before calling reverse.
               matchedDevice.reverse([ports.secure, ports.insecure]);
             }
             store.dispatch({
diff --git a/src/chrome/ExportDataPluginSheet.js b/src/chrome/ExportDataPluginSheet.js
index 312a14555..119edac63 100644
--- a/src/chrome/ExportDataPluginSheet.js
+++ b/src/chrome/ExportDataPluginSheet.js
@@ -11,7 +11,7 @@ import type {State as PluginState} from '../reducers/plugins.tsx';
 import type {State as PluginStatesState} from '../reducers/pluginStates.tsx';
 import type {ActiveSheet} from '../reducers/application.tsx';
 import {selectedPlugins as actionForSelectedPlugins} from '../reducers/plugins.tsx';
-import {getActivePersistentPlugins} from '../utils/pluginUtils';
+import {getActivePersistentPlugins} from '../utils/pluginUtils.tsx';
 import {
   ACTIVE_SHEET_SHARE_DATA,
   setActiveSheet as getActiveSheetAction,
diff --git a/src/index.js b/src/index.js
index 2934a5d37..346742001 100644
--- a/src/index.js
+++ b/src/index.js
@@ -24,7 +24,7 @@ export {clipboard} from 'electron';
 export {default as constants} from './fb-stubs/constants.tsx';
 export {connect} from 'react-redux';
 export {selectPlugin} from './reducers/connections.tsx';
-export {getPluginKey, getPersistedState} from './utils/pluginUtils.js';
+export {getPluginKey, getPersistedState} from './utils/pluginUtils.tsx';
 export type {Store, MiddlewareAPI} from './reducers/index.tsx';
 export {default as BaseDevice} from './devices/BaseDevice.tsx';
 
diff --git a/src/plugins/crash_reporter/__tests__/testCrashReporterPlugin.electron.js b/src/plugins/crash_reporter/__tests__/testCrashReporterPlugin.electron.js
index 2dc1016ef..0030608ee 100644
--- a/src/plugins/crash_reporter/__tests__/testCrashReporterPlugin.electron.js
+++ b/src/plugins/crash_reporter/__tests__/testCrashReporterPlugin.electron.js
@@ -13,7 +13,7 @@ import {
   parsePath,
   shouldShowCrashNotification,
 } from '../../crash_reporter';
-import {getPluginKey, getPersistedState} from '../../../utils/pluginUtils.js';
+import {getPluginKey, getPersistedState} from '../../../utils/pluginUtils.tsx';
 
 function setDefaultPersistedState(defaultState: PersistedState) {
   CrashReporterPlugin.defaultPersistedState = defaultState;
@@ -208,7 +208,6 @@ test('test getNewPersisitedStateFromCrashLog for non-empty defaultPersistedState
   const content =
     'Blaa Blaaa \n Blaa Blaaa \n Exception Type:  SIGSEGV \n Blaa Blaa \n Blaa Blaa';
   expect(perisistedState).toBeDefined();
-  // $FlowFixMe: Checked if perisistedState is defined or not
   const {crashes} = perisistedState;
   expect(crashes).toBeDefined();
   expect(crashes.length).toEqual(1);
diff --git a/src/utils/__tests__/pluginUtils.node.js b/src/utils/__tests__/pluginUtils.node.js
index 8b5854d86..c7cd256b9 100644
--- a/src/utils/__tests__/pluginUtils.node.js
+++ b/src/utils/__tests__/pluginUtils.node.js
@@ -5,7 +5,10 @@
  * @format
  */
 
-import {getPersistentPlugins, getActivePersistentPlugins} from '../pluginUtils';
+import {
+  getPersistentPlugins,
+  getActivePersistentPlugins,
+} from '../pluginUtils.tsx';
 import type {State as PluginsState} from '../../reducers/plugins.tsx';
 import type {State as PluginStatesState} from '../../reducers/pluginStates.tsx';
 import type {PluginDefinition} from '../../dispatcher/plugins.tsx';
diff --git a/src/utils/onRegisterDevice.js b/src/utils/onRegisterDevice.js
index f91a23b67..1108bd49d 100644
--- a/src/utils/onRegisterDevice.js
+++ b/src/utils/onRegisterDevice.js
@@ -8,7 +8,7 @@ import type {Store} from '../reducers/index.tsx';
 import {FlipperPlugin, FlipperDevicePlugin} from '../plugin.tsx';
 import {setPluginState} from '../reducers/pluginStates.tsx';
 import type BaseDevice from '../devices/BaseDevice.tsx';
-import {getPersistedState} from '../utils/pluginUtils.js';
+import {getPersistedState} from '../utils/pluginUtils.tsx';
 
 export function registerDeviceCallbackOnPlugins(
   store: Store,
diff --git a/src/utils/pluginUtils.js b/src/utils/pluginUtils.tsx
similarity index 78%
rename from src/utils/pluginUtils.js
rename to src/utils/pluginUtils.tsx
index 4913af68f..a0cc4fbcc 100644
--- a/src/utils/pluginUtils.js
+++ b/src/utils/pluginUtils.tsx
@@ -4,16 +4,16 @@
  * LICENSE file in the root directory of this source tree.
  * @format
  */
-import {FlipperDevicePlugin, FlipperPlugin} from '../plugin.tsx';
-import type {State as PluginStatesState} from '../reducers/pluginStates.tsx';
-import type BaseDevice from '../devices/BaseDevice.tsx';
+import {FlipperDevicePlugin, FlipperPlugin} from '../plugin';
+import BaseDevice from '../devices/BaseDevice';
+import {State as PluginStatesState} from '../reducers/pluginStates';
 import {pluginsClassMap} from './exportData.js';
-import type {State as PluginsState} from '../reducers/plugins.tsx';
-import type {PluginDefinition} from '../dispatcher/plugins.tsx';
+import {State as PluginsState} from '../reducers/plugins';
+import {PluginDefinition} from '../dispatcher/plugins';
 
 export function getPluginKey(
-  selectedApp: ?string,
-  baseDevice: ?BaseDevice,
+  selectedApp: string | null,
+  baseDevice: BaseDevice | null,
   pluginID: string,
 ): string {
   if (selectedApp) {
@@ -28,12 +28,9 @@ export function getPluginKey(
 
 export function getPersistedState<PersistedState>(
   pluginKey: string,
-  persistingPlugin: ?Class<
-    | FlipperPlugin<*, *, PersistedState>
-    | FlipperDevicePlugin<*, *, PersistedState>,
-  >,
+  persistingPlugin: typeof FlipperPlugin | typeof FlipperDevicePlugin | null,
   pluginStates: PluginStatesState,
-): ?PersistedState {
+): PersistedState | null {
   if (!persistingPlugin) {
     return null;
   }
@@ -51,7 +48,7 @@ export function getActivePersistentPlugins(
 ): Array<string> {
   const pluginsMap: Map<
     string,
-    Class<FlipperDevicePlugin<> | FlipperPlugin<>>,
+    typeof FlipperDevicePlugin | typeof FlipperPlugin
   > = pluginsClassMap(plugins);
   return getPersistentPlugins(plugins).filter(plugin => {
     const pluginClass = pluginsMap.get(plugin);
@@ -67,7 +64,7 @@ export function getActivePersistentPlugins(
 export function getPersistentPlugins(plugins: PluginsState): Array<string> {
   const pluginsMap: Map<
     string,
-    Class<FlipperDevicePlugin<> | FlipperPlugin<>>,
+    typeof FlipperDevicePlugin | typeof FlipperPlugin
   > = pluginsClassMap(plugins);
 
   const arr: Array<PluginDefinition> = plugins.disabledPlugins.concat(