diff --git a/server/src/lib/database-seeds/repo.ts b/server/src/lib/database-seeds/repo.ts
index f8a4abbda..a5384bc15 100644
--- a/server/src/lib/database-seeds/repo.ts
+++ b/server/src/lib/database-seeds/repo.ts
@@ -1,10 +1,10 @@
-import path from "path";
-import os from "os";
+import fs from "fs/promises";
 import CreateLogCtx from "lib/logger/logger";
 import { Environment, ServerConfig } from "lib/setup/config";
-import { asyncExec } from "utils/misc";
+import os from "os";
+import path from "path";
 import { Game } from "tachi-common";
-import fs from "fs/promises";
+import { asyncExec } from "utils/misc";
 
 const logger = CreateLogCtx(__filename);
 
diff --git a/server/src/lib/game-settings/create-game-settings.ts b/server/src/lib/game-settings/create-game-settings.ts
index 9256ecc45..035b628d1 100644
--- a/server/src/lib/game-settings/create-game-settings.ts
+++ b/server/src/lib/game-settings/create-game-settings.ts
@@ -1,6 +1,6 @@
 import db from "external/mongo/db";
 import CreateLogCtx from "lib/logger/logger";
-import { Game, integer, Playtype, Playtypes } from "tachi-common";
+import { Game, integer, Playtype } from "tachi-common";
 
 const logger = CreateLogCtx(__filename);
 
diff --git a/server/src/lib/score-import/framework/calculated-data/stats.ts b/server/src/lib/score-import/framework/calculated-data/stats.ts
index 618ef7425..b17d8bfc3 100644
--- a/server/src/lib/score-import/framework/calculated-data/stats.ts
+++ b/server/src/lib/score-import/framework/calculated-data/stats.ts
@@ -1,13 +1,5 @@
 import { KtLogger } from "lib/logger/logger";
-import {
-	ChartDocument,
-	Game,
-	GetGamePTConfig,
-	IIDX_LAMPS,
-	integer,
-	Playtype,
-	Playtypes,
-} from "tachi-common";
+import { ChartDocument, Game, GetGamePTConfig, IIDX_LAMPS, integer, Playtype } from "tachi-common";
 import { DryScore } from "../common/types";
 
 /**
diff --git a/server/src/lib/score-import/framework/common/get-input-parser.ts b/server/src/lib/score-import/framework/common/get-input-parser.ts
index d09f3330a..8c9af7bc4 100644
--- a/server/src/lib/score-import/framework/common/get-input-parser.ts
+++ b/server/src/lib/score-import/framework/common/get-input-parser.ts
@@ -1,8 +1,8 @@
 import { KtLogger } from "lib/logger/logger";
 import {
-	ParserFunctionReturns,
-	ImportTypeDataMap,
 	ImportTypeContextMap,
+	ImportTypeDataMap,
+	ParserFunctionReturns,
 } from "lib/score-import/import-types/common/types";
 import { Parsers } from "lib/score-import/import-types/parsers";
 import { ScoreImportJobData } from "lib/score-import/worker/types";
diff --git a/server/src/lib/score-import/framework/common/string-asserts.ts b/server/src/lib/score-import/framework/common/string-asserts.ts
index 67e3bc8f4..9d9dc6f71 100644
--- a/server/src/lib/score-import/framework/common/string-asserts.ts
+++ b/server/src/lib/score-import/framework/common/string-asserts.ts
@@ -1,4 +1,4 @@
-import { Difficulties, Game, GetGamePTConfig, IDStrings, Playtype, Playtypes } from "tachi-common";
+import { Difficulties, Game, GetGamePTConfig, IDStrings, Playtype } from "tachi-common";
 import { InvalidScoreFailure } from "./converter-failures";
 export function AssertStrAsDifficulty(
 	strVal: string,
diff --git a/server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.ts b/server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.ts
index 886784a24..90fb3aefb 100644
--- a/server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.ts
+++ b/server/src/lib/score-import/framework/user-game-stats/builtin-class-handlers.ts
@@ -7,7 +7,7 @@ import {
 	WACCA_COLOURS,
 } from "lib/constants/classes";
 import { KtLogger } from "lib/logger/logger";
-import { Game, integer, Playtype, Playtypes, ScoreCalculatedDataLookup } from "tachi-common";
+import { Game, integer, Playtype, ScoreCalculatedDataLookup } from "tachi-common";
 import { GameClasses } from "tachi-common/js/game-classes";
 
 export function CalculateSDVXClass(
diff --git a/server/src/lib/score-import/framework/user-game-stats/rating.ts b/server/src/lib/score-import/framework/user-game-stats/rating.ts
index 97a642a5a..14ff5e70d 100644
--- a/server/src/lib/score-import/framework/user-game-stats/rating.ts
+++ b/server/src/lib/score-import/framework/user-game-stats/rating.ts
@@ -1,15 +1,15 @@
-import {
-	Game,
-	Playtypes,
-	integer,
-	ScoreCalculatedDataLookup,
-	IDStrings,
-	UserGameStats,
-	PBScoreDocument,
-	Playtype,
-} from "tachi-common";
 import db from "external/mongo/db";
 import { KtLogger } from "lib/logger/logger";
+import {
+	Game,
+	IDStrings,
+	integer,
+	PBScoreDocument,
+	Playtype,
+	Playtypes,
+	ScoreCalculatedDataLookup,
+	UserGameStats,
+} from "tachi-common";
 
 type CustomCalcNames = ScoreCalculatedDataLookup[IDStrings];
 
diff --git a/server/src/lib/score-import/framework/user-game-stats/types.ts b/server/src/lib/score-import/framework/user-game-stats/types.ts
index e160f57d3..9b8085f63 100644
--- a/server/src/lib/score-import/framework/user-game-stats/types.ts
+++ b/server/src/lib/score-import/framework/user-game-stats/types.ts
@@ -1,5 +1,5 @@
 import { KtLogger } from "lib/logger/logger";
-import { Game, IDStrings, integer, Playtype, Playtypes } from "tachi-common";
+import { Game, IDStrings, integer, Playtype } from "tachi-common";
 import { GameClasses } from "tachi-common/js/game-classes";
 
 export type ScoreClasses = Partial<GameClasses<IDStrings>>;
diff --git a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts
index 53390bfad..c4b309002 100644
--- a/server/src/lib/score-import/import-types/common/batch-manual/parser.ts
+++ b/server/src/lib/score-import/import-types/common/batch-manual/parser.ts
@@ -10,7 +10,6 @@ import {
 	GetGamePTConfig,
 	ImportTypes,
 	Playtype,
-	Playtypes,
 } from "tachi-common";
 import { FormatPrError } from "utils/prudence";
 import ScoreImportFatalError from "../../../framework/score-importing/score-import-error";
diff --git a/server/src/lib/score-import/import-types/common/batch-manual/types.ts b/server/src/lib/score-import/import-types/common/batch-manual/types.ts
index ac4f96b85..8778f6239 100644
--- a/server/src/lib/score-import/import-types/common/batch-manual/types.ts
+++ b/server/src/lib/score-import/import-types/common/batch-manual/types.ts
@@ -1,4 +1,4 @@
-import { Game, GPTSupportedVersions, IDStrings, Playtype, Playtypes } from "tachi-common";
+import { Game, GPTSupportedVersions, IDStrings, Playtype } from "tachi-common";
 
 export interface BatchManualContext {
 	game: Game;
diff --git a/server/src/lib/search/search.ts b/server/src/lib/search/search.ts
index 6b78aae08..82dc731a3 100644
--- a/server/src/lib/search/search.ts
+++ b/server/src/lib/search/search.ts
@@ -9,7 +9,6 @@ import {
 	Game,
 	integer,
 	Playtype,
-	Playtypes,
 	PublicUserDocument,
 	SessionDocument,
 	SongDocument,
diff --git a/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/router.ts b/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/router.ts
index 28b3468b1..a7056afd3 100644
--- a/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/router.ts
+++ b/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/router.ts
@@ -14,13 +14,13 @@ import {
 import foldersRouter from "./folders/router";
 import { CheckUserPlayedGamePlaytype } from "./middleware";
 import pbsRouter from "./pbs/router";
+import rivalsRouter from "./rivals/router";
 import scoresRouter from "./scores/router";
 import sessionsRouter from "./sessions/router";
 import settingsRouter from "./settings/router";
 import showcaseRouter from "./showcase/router";
 import tablesRouter from "./tables/router";
 import targetsRouter from "./targets/router";
-import rivalsRouter from "./rivals/router";
 
 const router: Router = Router({ mergeParams: true });
 
diff --git a/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/targets/router.test.ts b/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/targets/router.test.ts
index f08bee5ab..fbf7c6b11 100644
--- a/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/targets/router.test.ts
+++ b/server/src/server/router/api/v1/users/_userID/games/_game/_playtype/targets/router.test.ts
@@ -1,20 +1,20 @@
-import db from "external/mongo/db";
-import t from "tap";
-import mockApi from "test-utils/mock-api";
-import ResetDBState from "test-utils/resets";
 import dm from "deepmerge";
-import {
-	HC511Goal,
-	HC511UserGoal,
-	TestingIIDXSPMilestone,
-	TestingIIDXSPMilestoneSub,
-} from "test-utils/test-data";
+import db from "external/mongo/db";
 import {
 	GoalDocument,
 	GoalSubscriptionDocument,
 	MilestoneDocument,
 	MilestoneSubscriptionDocument,
 } from "tachi-common";
+import t from "tap";
+import mockApi from "test-utils/mock-api";
+import ResetDBState from "test-utils/resets";
+import {
+	HC511Goal,
+	HC511UserGoal,
+	TestingIIDXSPMilestone,
+	TestingIIDXSPMilestoneSub,
+} from "test-utils/test-data";
 
 function mkGoalSub(merge: Partial<GoalSubscriptionDocument>) {
 	return dm(HC511UserGoal, merge);