diff --git a/app/components/tournament/TeamRoster.tsx b/app/components/tournament/TeamRoster.tsx
index db8960ec7..c7e8314a7 100644
--- a/app/components/tournament/TeamRoster.tsx
+++ b/app/components/tournament/TeamRoster.tsx
@@ -1,4 +1,5 @@
-import { useFetcher } from "remix";
+import { Form, useTransition } from "remix";
+import { ManageRosterAction } from "~/routes/to/$organization.$tournament/manage-roster";
 import { useUser } from "~/utils/hooks";
 import { Button } from "../Button";
 
@@ -76,20 +77,19 @@ function DeleteFromRosterButton({
   playerId: string;
   teamId: string;
 }) {
-  const fetcher = useFetcher();
+  const transition = useTransition();
   return (
-    <fetcher.Form
-      method="delete"
-      action={`/api/tournamentTeam/${teamId}/remove-player/${playerId}`}
-    >
-      <Button
-        variant="destructive"
-        tiny
-        loadingText="Removing..."
-        loading={fetcher.state !== "idle"}
-      >
+    <Form method="post">
+      <input
+        type="hidden"
+        name="_action"
+        value={ManageRosterAction.DELETE_PLAYER}
+      />
+      <input type="hidden" name="teamId" value={teamId} />
+      <input type="hidden" name="userId" value={playerId} />
+      <Button variant="destructive" tiny loading={transition.state !== "idle"}>
         Remove
       </Button>
-    </fetcher.Form>
+    </Form>
   );
 }
diff --git a/app/routes/api/tournamentTeam/$teamId/remove-player.$playerId.ts b/app/routes/api/tournamentTeam/$teamId/remove-player.$playerId.ts
deleted file mode 100644
index 7b6cc9491..000000000
--- a/app/routes/api/tournamentTeam/$teamId/remove-player.$playerId.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ActionFunction } from "@remix-run/server-runtime";
-import { removePlayerFromTeam } from "~/services/tournament";
-import { requireUser } from "~/utils";
-
-export const action: ActionFunction = async ({ params, context }) => {
-  const teamId = params.teamId!;
-  const playerId = params.playerId!;
-
-  const user = requireUser(context);
-
-  await removePlayerFromTeam({
-    captainId: user.id,
-    playerId,
-    teamId,
-  });
-  return new Response("Player deleted from team", { status: 200 });
-};
diff --git a/app/routes/to/$organization.$tournament/manage-roster.tsx b/app/routes/to/$organization.$tournament/manage-roster.tsx
index 7217c7153..4fb7290d0 100644
--- a/app/routes/to/$organization.$tournament/manage-roster.tsx
+++ b/app/routes/to/$organization.$tournament/manage-roster.tsx
@@ -31,6 +31,11 @@ export const links: LinksFunction = () => {
   return [{ rel: "stylesheet", href: styles }];
 };
 
+export enum ManageRosterAction {
+  ADD_PLAYER = "ADD_PLAYER",
+  DELETE_PLAYER = "DELETE_PLAYER",
+}
+
 type ActionData = {
   fieldErrors?: { userId?: string | undefined };
   fields?: {
@@ -45,11 +50,12 @@ export const action: ActionFunction = async ({
   const data = Object.fromEntries(await request.formData());
   invariant(typeof data.userId === "string", "Invalid type for userId");
   invariant(typeof data.teamId === "string", "Invalid type for teamId");
+  invariant(typeof data._action === "string", "Invalid type for _action");
 
   const user = requireUser(context);
 
-  switch (request.method) {
-    case "POST":
+  switch (data._action) {
+    case ManageRosterAction.ADD_PLAYER: {
       try {
         await putPlayerToTeam({
           teamId: data.teamId,
@@ -69,18 +75,21 @@ export const action: ActionFunction = async ({
       }
 
       return new Response("Added player to team", { status: 200 });
-    case "DELETE":
+    }
+    case ManageRosterAction.DELETE_PLAYER: {
       await removePlayerFromTeam({
         captainId: user.id,
         playerId: data.userId,
         teamId: data.teamId,
       });
       return new Response("Player deleted from team", { status: 200 });
-    default:
+    }
+    default: {
       return new Response(undefined, {
         status: 405,
         headers: { Allow: "POST, DELETE" },
       });
+    }
   }
 };
 
@@ -158,6 +167,11 @@ export default function ManageRosterPage() {
           {trustingUsers.length > 0 && (
             <div className="tournament__manage-roster__actions__section">
               <Form method="post">
+                <input
+                  type="hidden"
+                  name="_action"
+                  value={ManageRosterAction.ADD_PLAYER}
+                />
                 <input type="hidden" name="teamId" value={ownTeam.id} />
                 <label htmlFor="userId">
                   Add players you previously played with
@@ -178,7 +192,6 @@ export default function ManageRosterPage() {
                 <Button
                   className="tournament__manage-roster__input__button"
                   type="submit"
-                  loadingText="Adding..."
                   loading={isSubmitting}
                 >
                   Add to roster
diff --git a/app/utils/index.ts b/app/utils/index.ts
index 63f0c6375..87b563b29 100644
--- a/app/utils/index.ts
+++ b/app/utils/index.ts
@@ -1,7 +1,5 @@
-import { json } from "remix";
-import invariant from "tiny-invariant";
-import { useLocation } from "remix";
 import type { CSSProperties } from "react";
+import { json, useLocation } from "remix";
 
 export function makeTitle(endOfTitle?: string) {
   return endOfTitle ? `sendou.ink | ${endOfTitle}` : "sendou.ink";