diff --git a/examples/openapi-ts-axios/src/client/index.ts b/examples/openapi-ts-axios/src/client/index.ts
index 745c8f67a..688e3c912 100644
--- a/examples/openapi-ts-axios/src/client/index.ts
+++ b/examples/openapi-ts-axios/src/client/index.ts
@@ -1,4 +1,3 @@
 // This file is auto-generated by @hey-api/openapi-ts
-export * from './schemas.gen';
 export * from './sdk.gen';
 export * from './types.gen';
diff --git a/examples/openapi-ts-fastify/src/client/types.gen.ts b/examples/openapi-ts-fastify/src/client/types.gen.ts
index 18ad10e60..bf1ded02f 100644
--- a/examples/openapi-ts-fastify/src/client/types.gen.ts
+++ b/examples/openapi-ts-fastify/src/client/types.gen.ts
@@ -45,6 +45,8 @@ export type ListPetsResponse = ListPetsResponses[keyof ListPetsResponses];
 
 export type CreatePetsData = {
   body?: never;
+  path?: never;
+  query?: never;
   url: '/pets';
 };
 
diff --git a/examples/openapi-ts-fetch/src/client/index.ts b/examples/openapi-ts-fetch/src/client/index.ts
index 745c8f67a..688e3c912 100644
--- a/examples/openapi-ts-fetch/src/client/index.ts
+++ b/examples/openapi-ts-fetch/src/client/index.ts
@@ -1,4 +1,3 @@
 // This file is auto-generated by @hey-api/openapi-ts
-export * from './schemas.gen';
 export * from './sdk.gen';
 export * from './types.gen';
diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/index.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/index.ts
index 745c8f67a..688e3c912 100644
--- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/index.ts
+++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/index.ts
@@ -1,4 +1,3 @@
 // This file is auto-generated by @hey-api/openapi-ts
-export * from './schemas.gen';
 export * from './sdk.gen';
 export * from './types.gen';
diff --git a/examples/openapi-ts-tanstack-react-query/src/client/index.ts b/examples/openapi-ts-tanstack-react-query/src/client/index.ts
index 745c8f67a..688e3c912 100644
--- a/examples/openapi-ts-tanstack-react-query/src/client/index.ts
+++ b/examples/openapi-ts-tanstack-react-query/src/client/index.ts
@@ -1,4 +1,3 @@
 // This file is auto-generated by @hey-api/openapi-ts
-export * from './schemas.gen';
 export * from './sdk.gen';
 export * from './types.gen';
diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/index.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/index.ts
index 745c8f67a..688e3c912 100644
--- a/examples/openapi-ts-tanstack-svelte-query/src/client/index.ts
+++ b/examples/openapi-ts-tanstack-svelte-query/src/client/index.ts
@@ -1,4 +1,3 @@
 // This file is auto-generated by @hey-api/openapi-ts
-export * from './schemas.gen';
 export * from './sdk.gen';
 export * from './types.gen';
diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/index.ts b/examples/openapi-ts-tanstack-vue-query/src/client/index.ts
index c7900424d..544a87d45 100644
--- a/examples/openapi-ts-tanstack-vue-query/src/client/index.ts
+++ b/examples/openapi-ts-tanstack-vue-query/src/client/index.ts
@@ -1,4 +1,3 @@
 // This file is auto-generated by @hey-api/openapi-ts
-export * from './schemas.gen'
 export * from './sdk.gen'
 export * from './types.gen'
diff --git a/examples/openapi-ts-tanstack-vue-query/src/views/TanstackExample.vue b/examples/openapi-ts-tanstack-vue-query/src/views/TanstackExample.vue
index eb99a3077..8664094e2 100644
--- a/examples/openapi-ts-tanstack-vue-query/src/views/TanstackExample.vue
+++ b/examples/openapi-ts-tanstack-vue-query/src/views/TanstackExample.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { PetSchema, type Pet } from '@/client'
+import type { Pet } from '@/client'
+import { PetSchema } from '@/client/schemas.gen'
 import {
   addPetMutation,
   getPetByIdOptions,
diff --git a/packages/client-fetch/src/types.ts b/packages/client-fetch/src/types.ts
index 036ec9500..e6ad7192a 100644
--- a/packages/client-fetch/src/types.ts
+++ b/packages/client-fetch/src/types.ts
@@ -195,12 +195,12 @@ export type OptionsLegacyParser<
   ThrowOnError extends boolean = boolean,
 > = Data extends { body?: any }
   ? Data extends { headers?: any }
-    ? OmitKeys<RequestOptions<ThrowOnError>, 'body' | 'headers'> & Data
-    : OmitKeys<RequestOptions<ThrowOnError>, 'body'> &
+    ? OmitKeys<RequestOptions<ThrowOnError>, 'body' | 'headers' | 'url'> & Data
+    : OmitKeys<RequestOptions<ThrowOnError>, 'body' | 'url'> &
         Data &
         Pick<RequestOptions<ThrowOnError>, 'headers'>
   : Data extends { headers?: any }
-    ? OmitKeys<RequestOptions<ThrowOnError>, 'headers'> &
+    ? OmitKeys<RequestOptions<ThrowOnError>, 'headers' | 'url'> &
         Data &
         Pick<RequestOptions<ThrowOnError>, 'body'>
-    : RequestOptions<ThrowOnError> & Data;
+    : OmitKeys<RequestOptions<ThrowOnError>, 'url'> & Data;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle/client/types.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle/client/types.ts.snap
index 036ec9500..e6ad7192a 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle/client/types.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle/client/types.ts.snap
@@ -195,12 +195,12 @@ export type OptionsLegacyParser<
   ThrowOnError extends boolean = boolean,
 > = Data extends { body?: any }
   ? Data extends { headers?: any }
-    ? OmitKeys<RequestOptions<ThrowOnError>, 'body' | 'headers'> & Data
-    : OmitKeys<RequestOptions<ThrowOnError>, 'body'> &
+    ? OmitKeys<RequestOptions<ThrowOnError>, 'body' | 'headers' | 'url'> & Data
+    : OmitKeys<RequestOptions<ThrowOnError>, 'body' | 'url'> &
         Data &
         Pick<RequestOptions<ThrowOnError>, 'headers'>
   : Data extends { headers?: any }
-    ? OmitKeys<RequestOptions<ThrowOnError>, 'headers'> &
+    ? OmitKeys<RequestOptions<ThrowOnError>, 'headers' | 'url'> &
         Data &
         Pick<RequestOptions<ThrowOnError>, 'body'>
-    : RequestOptions<ThrowOnError> & Data;
+    : OmitKeys<RequestOptions<ThrowOnError>, 'url'> & Data;
diff --git a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle_transform/client/types.ts.snap b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle_transform/client/types.ts.snap
index 036ec9500..e6ad7192a 100644
--- a/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle_transform/client/types.ts.snap
+++ b/packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-fetch-bundle_transform/client/types.ts.snap
@@ -195,12 +195,12 @@ export type OptionsLegacyParser<
   ThrowOnError extends boolean = boolean,
 > = Data extends { body?: any }
   ? Data extends { headers?: any }
-    ? OmitKeys<RequestOptions<ThrowOnError>, 'body' | 'headers'> & Data
-    : OmitKeys<RequestOptions<ThrowOnError>, 'body'> &
+    ? OmitKeys<RequestOptions<ThrowOnError>, 'body' | 'headers' | 'url'> & Data
+    : OmitKeys<RequestOptions<ThrowOnError>, 'body' | 'url'> &
         Data &
         Pick<RequestOptions<ThrowOnError>, 'headers'>
   : Data extends { headers?: any }
-    ? OmitKeys<RequestOptions<ThrowOnError>, 'headers'> &
+    ? OmitKeys<RequestOptions<ThrowOnError>, 'headers' | 'url'> &
         Data &
         Pick<RequestOptions<ThrowOnError>, 'body'>
-    : RequestOptions<ThrowOnError> & Data;
+    : OmitKeys<RequestOptions<ThrowOnError>, 'url'> & Data;