diff --git a/src/lib/hooks/callApi.ts b/src/lib/hooks/callApi.ts
deleted file mode 100644
index 1699ec2..0000000
--- a/src/lib/hooks/callApi.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const callGetApi = async (input: RequestInfo, fetchInternal = fetch) => {
-  return await fetchInternal(input);
-};
-
-export const callPostApi = async <T>(input: RequestInfo, payload?: T, fetchInternal = fetch) => {
-  return await fetchInternal(input, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: payload ? JSON.stringify(payload) : undefined,
-  });
-};
diff --git a/src/lib/services/category.ts b/src/lib/services/category.ts
index 7e0443f..c53a6f2 100644
--- a/src/lib/services/category.ts
+++ b/src/lib/services/category.ts
@@ -27,7 +27,6 @@ export const requestCategoryCreation = async (
 };
 
 export const requestFileRemovalFromCategory = async (fileId: number, categoryId: number) => {
-
   try {
     await trpc().category.removeFile.mutate({ id: categoryId, file: fileId });
     return true;
diff --git a/src/lib/services/file.ts b/src/lib/services/file.ts
index 7e93c7a..da05824 100644
--- a/src/lib/services/file.ts
+++ b/src/lib/services/file.ts
@@ -1,4 +1,3 @@
-import { callGetApi } from "$lib/hooks";
 import { getAllFileInfos } from "$lib/indexedDB/filesystem";
 import { decryptData } from "$lib/modules/crypto";
 import {
@@ -58,7 +57,7 @@ export const requestFileThumbnailDownload = async (fileId: number, dataKey?: Cry
   }
   const { contentIv: thumbnailEncryptedIv } = thumbnailInfo;
 
-  const res = await callGetApi(`/api/file/${fileId}/thumbnail/download`);
+  const res = await fetch(`/api/file/${fileId}/thumbnail/download`);
   if (!res.ok) return null;
 
   const thumbnailEncrypted = await res.arrayBuffer();
diff --git a/src/lib/hooks/gotoStateful.ts b/src/lib/utils/gotoStateful.ts
similarity index 100%
rename from src/lib/hooks/gotoStateful.ts
rename to src/lib/utils/gotoStateful.ts
diff --git a/src/lib/hooks/index.ts b/src/lib/utils/index.ts
similarity index 54%
rename from src/lib/hooks/index.ts
rename to src/lib/utils/index.ts
index e3b8dde..4c24322 100644
--- a/src/lib/hooks/index.ts
+++ b/src/lib/utils/index.ts
@@ -1,2 +1 @@
-export * from "./callApi";
 export * from "./gotoStateful";
diff --git a/src/routes/(fullscreen)/key/export/+page.ts b/src/routes/(fullscreen)/key/export/+page.ts
index a64ea53..5785158 100644
--- a/src/routes/(fullscreen)/key/export/+page.ts
+++ b/src/routes/(fullscreen)/key/export/+page.ts
@@ -1,5 +1,5 @@
 import { error } from "@sveltejs/kit";
-import { keyExportState } from "$lib/hooks/gotoStateful";
+import { keyExportState } from "$lib/utils/gotoStateful";
 import type { PageLoad } from "./$types";
 
 export const load: PageLoad = async () => {
diff --git a/src/routes/(fullscreen)/key/generate/+page.svelte b/src/routes/(fullscreen)/key/generate/+page.svelte
index 6f7609c..7292d78 100644
--- a/src/routes/(fullscreen)/key/generate/+page.svelte
+++ b/src/routes/(fullscreen)/key/generate/+page.svelte
@@ -4,9 +4,9 @@
   import { BottomDiv, Button, FullscreenDiv, TextButton } from "$lib/components/atoms";
   import { TitledDiv } from "$lib/components/molecules";
   import { ForceLoginModal } from "$lib/components/organisms";
-  import { gotoStateful } from "$lib/hooks";
   import { storeClientKeys } from "$lib/modules/key";
   import { clientKeyStore } from "$lib/stores";
+  import { gotoStateful } from "$lib/utils";
   import Order from "./Order.svelte";
   import {
     generateClientKeys,
diff --git a/src/trpc/init.server.ts b/src/trpc/init.server.ts
index 8b88157..8d5d7c5 100644
--- a/src/trpc/init.server.ts
+++ b/src/trpc/init.server.ts
@@ -3,11 +3,10 @@ import { initTRPC, TRPCError } from "@trpc/server";
 import superjson from "superjson";
 import { authorizeMiddleware, authorizeClientMiddleware } from "./middlewares/authorize";
 
+export const createContext = (event: RequestEvent) => event;
 export type Context = Awaited<ReturnType<typeof createContext>>;
 
-export const createContext = (event: RequestEvent) => event;
 export const t = initTRPC.context<Context>().create({ transformer: superjson });
-
 export const router = t.router;
 export const publicProcedure = t.procedure;