diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts
index 9e24647f..f19e2ef0 100644
--- a/packages/client/src/client.ts
+++ b/packages/client/src/client.ts
@@ -2,7 +2,15 @@
 /* THIS FILE WAS AUTO-GENERATED */
 import { Readable } from 'stream'
 
-import { BaseTelegramClient, BaseTelegramClientOptions, MaybeArray, MaybeAsync, tl } from '@mtcute/core'
+import {
+    BaseTelegramClient,
+    BaseTelegramClientOptions,
+    MaybeArray,
+    MaybeAsync,
+    PartialExcept,
+    PartialOnly,
+    tl,
+} from '@mtcute/core'
 import { AsyncLock, ConditionVariable, Deque, Logger, SortedLinkedList } from '@mtcute/core/utils'
 import { tdFileId } from '@mtcute/file-id'
 
@@ -219,8 +227,6 @@ import {
     MessageMedia,
     MessageReactions,
     ParsedUpdate,
-    PartialExcept,
-    PartialOnly,
     PeerReaction,
     PeersIndex,
     Photo,
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 1060f9bb..f6c76784 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -3,4 +3,4 @@ export * from './client'
 export * from './types'
 export * from './utils/peer-utils'
 export { createDummyUpdate } from './utils/updates-utils'
-export { assertNever, JsonFileStorage, LocalstorageStorage, MemoryStorage, tl } from '@mtcute/core'
+export * from '@mtcute/core'
diff --git a/packages/client/src/methods/_imports.ts b/packages/client/src/methods/_imports.ts
index c17188d6..2cf48488 100644
--- a/packages/client/src/methods/_imports.ts
+++ b/packages/client/src/methods/_imports.ts
@@ -3,7 +3,7 @@
 import { Readable } from 'stream'
 
 // @copy
-import { MaybeArray, MaybeAsync } from '@mtcute/core'
+import { MaybeArray, MaybeAsync, PartialExcept, PartialOnly } from '@mtcute/core'
 // @copy
 import { AsyncLock, ConditionVariable, Deque, Logger, SortedLinkedList } from '@mtcute/core/utils'
 // @copy
@@ -46,8 +46,6 @@ import {
     MessageMedia,
     MessageReactions,
     ParsedUpdate,
-    PartialExcept,
-    PartialOnly,
     PeerReaction,
     PeersIndex,
     Photo,
diff --git a/packages/client/src/methods/auth/start.ts b/packages/client/src/methods/auth/start.ts
index 70aedff9..ce0283f9 100644
--- a/packages/client/src/methods/auth/start.ts
+++ b/packages/client/src/methods/auth/start.ts
@@ -1,8 +1,8 @@
 /* eslint-disable no-console */
-import { MtArgumentError, tl } from '@mtcute/core'
+import { MaybeAsync, MtArgumentError, tl } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
-import { MaybeAsync, MaybeDynamic, SentCode, TermsOfService, User } from '../../types'
+import { MaybeDynamic, SentCode, TermsOfService, User } from '../../types'
 import { normalizePhoneNumber, resolveMaybeDynamic } from '../../utils/misc-utils'
 
 /**
diff --git a/packages/client/src/types/index.ts b/packages/client/src/types/index.ts
index 1c2019e1..78f37860 100644
--- a/packages/client/src/types/index.ts
+++ b/packages/client/src/types/index.ts
@@ -11,4 +11,3 @@ export * from './parser'
 export * from './peers'
 export * from './updates'
 export { ArrayWithTotal, MaybeDynamic } from './utils'
-export { MaybeAsync, PartialExcept, PartialOnly } from '@mtcute/core'
diff --git a/packages/client/src/types/peers/index.ts b/packages/client/src/types/peers/index.ts
index 2ca986a6..1a3e1774 100644
--- a/packages/client/src/types/peers/index.ts
+++ b/packages/client/src/types/peers/index.ts
@@ -12,11 +12,6 @@ export * from './peers-index'
 export * from './typing-status'
 export * from './user'
 
-/**
- * Peer types that have one-to-one relation to tl.Peer* types.
- */
-export type BasicPeerType = 'user' | 'chat' | 'channel'
-
 /**
  * More extensive peer types, that differentiate between
  * users and bots, channels and supergroups.
diff --git a/packages/client/src/types/updates/user-typing-update.ts b/packages/client/src/types/updates/user-typing-update.ts
index 4c4c11cf..285acc38 100644
--- a/packages/client/src/types/updates/user-typing-update.ts
+++ b/packages/client/src/types/updates/user-typing-update.ts
@@ -1,7 +1,7 @@
-import { getBarePeerId, MtUnsupportedError, tl, toggleChannelIdMark } from '@mtcute/core'
+import { BasicPeerType, getBarePeerId, MtUnsupportedError, tl, toggleChannelIdMark } from '@mtcute/core'
 
 import { TelegramClient } from '../../client'
-import { BasicPeerType, Chat, TypingStatus, User } from '../'
+import { Chat, TypingStatus, User } from '../'
 import { makeInspectable } from '../utils'
 
 /**