diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index 8cbdab1d20..b1d6b5c10f 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -1,31 +1,11 @@
 import { ModerationLogPayloads, notificationTypes } from './consts.js';
-import { DriveFile, Page, User, UserDetailed } from './autogen/models';
+import { Page, User, UserDetailed } from './autogen/models';
 export * from './autogen/entities';
 export * from './autogen/models';
 
 export type ID = string;
 export type DateString = string;
 
-type TODO = Record<string, any>;
-
-export type UserGroup = TODO;
-
-export type MessagingMessage = {
-	id: ID;
-	createdAt: DateString;
-	file: DriveFile | null;
-	fileId: DriveFile['id'] | null;
-	isRead: boolean;
-	reads: User['id'][];
-	text: string | null;
-	user: User;
-	userId: User['id'];
-	recipient?: User | null;
-	recipientId: User['id'] | null;
-	group?: UserGroup | null;
-	groupId: UserGroup['id'] | null;
-};
-
 export type PageEvent = {
 	pageId: Page['id'];
 	event: string;
@@ -34,15 +14,6 @@ export type PageEvent = {
 	user: User;
 };
 
-export type UserSorting =
-	| '+follower'
-	| '-follower'
-	| '+createdAt'
-	| '-createdAt'
-	| '+updatedAt'
-	| '-updatedAt';
-export type OriginType = 'combined' | 'local' | 'remote';
-
 export type ModerationLog = {
 	id: ID;
 	createdAt: DateString;
diff --git a/packages/misskey-js/src/streaming.types.ts b/packages/misskey-js/src/streaming.types.ts
index fbe4555900..7981c280f6 100644
--- a/packages/misskey-js/src/streaming.types.ts
+++ b/packages/misskey-js/src/streaming.types.ts
@@ -1,5 +1,5 @@
-import { Antenna, DriveFile, EmojiDetailed, MeDetailed, Note, User } from './autogen/models.js';
-import { MessagingMessage, PageEvent, UserGroup } from './entities.js';
+import { Antenna, DriveFile, EmojiDetailed, MeDetailed, Note, User, Notification } from './autogen/models.js';
+import { PageEvent } from './entities.js';
 
 type FIXME = any;
 
@@ -23,9 +23,6 @@ export type Channels = {
 			readAllUnreadMentions: () => void;
 			unreadSpecifiedNote: (payload: Note['id']) => void;
 			readAllUnreadSpecifiedNotes: () => void;
-			readAllMessagingMessages: () => void;
-			messagingMessage: (payload: MessagingMessage) => void;
-			unreadMessagingMessage: (payload: MessagingMessage) => void;
 			readAllAntennas: () => void;
 			unreadAntenna: (payload: Antenna) => void;
 			readAllAnnouncements: () => void;
@@ -71,23 +68,6 @@ export type Channels = {
 		};
 		receives: null;
 	};
-	messaging: {
-		params: {
-			otherparty?: User['id'] | null;
-			group?: UserGroup['id'] | null;
-		};
-		events: {
-			message: (payload: MessagingMessage) => void;
-			deleted: (payload: MessagingMessage['id']) => void;
-			read: (payload: MessagingMessage['id'][]) => void;
-			typers: (payload: User[]) => void;
-		};
-		receives: {
-			read: {
-				id: MessagingMessage['id'];
-			};
-		};
-	};
 	serverStats: {
 		params: null;
 		events: {