diff --git a/src/components/App.tsx b/src/components/App.tsx
index cef8c3f9..77a05db8 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -7,6 +7,7 @@ import { Dynamic } from 'solid-js/web'
 import { ConfirmProvider } from '../context/confirm'
 import { ConnectProvider } from '../context/connect'
 import { EditorProvider } from '../context/editor'
+import { InboxProvider } from '../context/inbox'
 import { LocalizeProvider } from '../context/localize'
 import { MediaQueryProvider } from '../context/mediaQuery'
 import { NotificationsProvider } from '../context/notifications'
@@ -42,7 +43,6 @@ import { SearchPage } from '../pages/search.page'
 import { TopicPage } from '../pages/topic.page'
 import { ROUTES, useRouter } from '../stores/router'
 import { hideModal, MODALS, showModal } from '../stores/ui'
-import { InboxProvider } from '../context/inbox'
 
 // TODO: lazy load
 // const SomePage = lazy(() => import('./Pages/SomePage'))
diff --git a/src/components/Nav/Header/Header.tsx b/src/components/Nav/Header/Header.tsx
index 0b6a75ee..fb597f05 100644
--- a/src/components/Nav/Header/Header.tsx
+++ b/src/components/Nav/Header/Header.tsx
@@ -4,8 +4,6 @@ import { getPagePath, redirectPage } from '@nanostores/router'
 import { clsx } from 'clsx'
 import { Show, createSignal, createEffect, onMount, onCleanup, For } from 'solid-js'
 
-import { apiClient } from '../../../utils/apiClient'
-
 import { useLocalize } from '../../../context/localize'
 import { useSession } from '../../../context/session'
 import { apiClient } from '../../../graphql/client/core'
@@ -22,7 +20,6 @@ import { HeaderAuth } from '../HeaderAuth'
 import { Modal } from '../Modal'
 import { SearchModal } from '../SearchModal/SearchModal'
 import { Snackbar } from '../Snackbar'
-import { SearchModal } from '../SearchModal/SearchModal'
 
 import { Link } from './Link'
 
diff --git a/src/components/Nav/SearchModal/SearchModal.tsx b/src/components/Nav/SearchModal/SearchModal.tsx
index 3c786608..00b7aa46 100644
--- a/src/components/Nav/SearchModal/SearchModal.tsx
+++ b/src/components/Nav/SearchModal/SearchModal.tsx
@@ -3,6 +3,9 @@ import type { Shout } from '../../../graphql/schema/core.gen'
 import { createSignal, Show, For } from 'solid-js'
 
 import { useLocalize } from '../../../context/localize'
+import { loadShoutsSearch, useArticlesStore } from '../../../stores/zine/articles'
+import { restoreScrollPosition, saveScrollPosition } from '../../../utils/scroll'
+import { byScore } from '../../../utils/sortby'
 import { Button } from '../../_shared/Button'
 import { Icon } from '../../_shared/Icon'
 import { FEED_PAGE_SIZE } from '../../Views/Feed/Feed'
@@ -10,9 +13,6 @@ import { FEED_PAGE_SIZE } from '../../Views/Feed/Feed'
 import { SearchResultItem } from './SearchResultItem'
 
 import styles from './SearchModal.module.scss'
-import { restoreScrollPosition, saveScrollPosition } from '../../../utils/scroll'
-import { loadShoutsSearch, useArticlesStore } from '../../../stores/zine/articles'
-import { byScore } from '../../../utils/sortby'
 
 // @@TODO handle empty article options after backend support (subtitle, cover, etc.)
 // @@TODO implement load more
diff --git a/src/components/ProfileSettings/ProfileSettings.tsx b/src/components/ProfileSettings/ProfileSettings.tsx
index 8f841940..348db613 100644
--- a/src/components/ProfileSettings/ProfileSettings.tsx
+++ b/src/components/ProfileSettings/ProfileSettings.tsx
@@ -9,23 +9,21 @@ import { useLocalize } from '../../context/localize'
 import { useProfileForm } from '../../context/profile'
 import { useSession } from '../../context/session'
 import { useSnackbar } from '../../context/snackbar'
+import { showModal, hideModal } from '../../stores/ui'
 import { clone } from '../../utils/clone'
 import { getImageUrl } from '../../utils/getImageUrl'
 import { handleImageUpload } from '../../utils/handleImageUpload'
 import { profileSocialLinks } from '../../utils/profileSocialLinks'
 import { validateUrl } from '../../utils/validateUrl'
-
-import { Modal } from '../Nav/Modal'
 import { Button } from '../_shared/Button'
 import { Icon } from '../_shared/Icon'
+import { ImageCropper } from '../_shared/ImageCropper'
 import { Loading } from '../_shared/Loading'
 import { Popover } from '../_shared/Popover'
 import { SocialNetworkInput } from '../_shared/SocialNetworkInput'
-import { ImageCropper } from '../_shared/ImageCropper'
+import { Modal } from '../Nav/Modal'
 import { ProfileSettingsNavigation } from '../Nav/ProfileSettingsNavigation'
 
-import { showModal, hideModal } from '../../stores/ui'
-
 import styles from '../../pages/profile/Settings.module.scss'
 
 const SimplifiedEditor = lazy(() => import('../../components/Editor/SimplifiedEditor'))
diff --git a/src/components/_shared/ImageCropper/ImageCropper.tsx b/src/components/_shared/ImageCropper/ImageCropper.tsx
index 6e2646f8..e0cd0f7a 100644
--- a/src/components/_shared/ImageCropper/ImageCropper.tsx
+++ b/src/components/_shared/ImageCropper/ImageCropper.tsx
@@ -1,11 +1,10 @@
 import 'cropperjs/dist/cropper.css'
 
-import { createSignal, onMount, Show } from 'solid-js'
-import Cropper from 'cropperjs'
 import { UploadFile } from '@solid-primitives/upload'
+import Cropper from 'cropperjs'
+import { createSignal, onMount, Show } from 'solid-js'
 
 import { useLocalize } from '../../../context/localize'
-
 import { Button } from '../Button'
 
 import styles from './ImageCropper.module.scss'
diff --git a/src/utils/apiClient.ts b/src/utils/apiClient.ts
deleted file mode 100644
index e69de29b..00000000