diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts
index 2294e7022..39a54f4f0 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -43,17 +43,15 @@ import {
 	Permissions,
 	normalizeUrl,
 	DiscordApiErrors,
+	CloudAttachment,
+	ReadState,
+	Member,
+	Session,
 } from "@spacebar/util";
 import { HTTPError } from "lambert-server";
 import { In, Or, Equal, IsNull } from "typeorm";
 import fetch from "node-fetch-commonjs";
-import { CloudAttachment } from "../../../util/entities/CloudAttachment";
-import { ReadState } from "../../../util/entities/ReadState";
-import { Member } from "../../../util/entities/Member";
-import { Session } from "../../../util/entities/Session";
-import { ChannelType } from "@spacebar/schemas";
-import { Embed, MessageCreateAttachment, MessageCreateCloudAttachment, MessageCreateSchema, MessageType, Reaction } from "@spacebar/schemas";
-import { EmbedType } from "../../../schemas/api/messages/Embeds";
+import { ChannelType, Embed, EmbedType, MessageCreateAttachment, MessageCreateCloudAttachment, MessageCreateSchema, MessageType, Reaction } from "@spacebar/schemas";
 const allow_empty = false;
 // TODO: check webhook, application, system author, stickers
 // TODO: embed gifs/videos/images