diff --git a/packages/core/modules-sdk/src/remote-query/to-remote-query.ts b/packages/core/modules-sdk/src/remote-query/to-remote-query.ts
index 4236d7117a..d151a01859 100644
--- a/packages/core/modules-sdk/src/remote-query/to-remote-query.ts
+++ b/packages/core/modules-sdk/src/remote-query/to-remote-query.ts
@@ -3,9 +3,8 @@ import {
   RemoteQueryFilters,
   RemoteQueryGraph,
   RemoteQueryInput,
-  RemoteQueryObjectConfig,
 } from "@medusajs/types"
-import { QueryContext, QueryFilter, isObject } from "@medusajs/utils"
+import { isObject, QueryContext } from "@medusajs/utils"
 import { parseAndAssignFilters } from "./parse-filters"
 
 const FIELDS = "__fields"
@@ -15,6 +14,7 @@ const ARGUMENTS = "__args"
  * convert a specific API configuration to a remote query object
  *
  * @param config
+ * @param entitiesMap
  *
  * @example
  * const remoteQueryObject = toRemoteQuery({
@@ -32,7 +32,7 @@ const ARGUMENTS = "__args"
 export function toRemoteQuery<const TEntity extends string>(
   config: {
     entity: TEntity | keyof RemoteQueryEntryPoints
-    fields: RemoteQueryObjectConfig<TEntity>["fields"]
+    fields: RemoteQueryInput<TEntity>["fields"]
     filters?: RemoteQueryFilters<TEntity>
     pagination?: Partial<RemoteQueryInput<TEntity>["pagination"]>
     context?: Record<string, any>
@@ -60,11 +60,11 @@ export function toRemoteQuery<const TEntity extends string>(
         continue
       }
 
-      if (QueryContext.isQueryContext(src) || QueryFilter.isQueryFilter(src)) {
+      if (QueryContext.isQueryContext(src)) {
         const normalizedFilters = { ...src } as any
         delete normalizedFilters.__type
 
-        const prop = QueryFilter.isQueryFilter(src) ? "filters" : "context"
+        const prop = "context"
 
         if (topLevel) {
           target[ARGUMENTS] ??= {}
@@ -110,7 +110,7 @@ export function toRemoteQuery<const TEntity extends string>(
   }
 
   if (config.pagination) {
-    joinerQuery[entity][ARGUMENTS] ??= {}
+    joinerQuery[entity][ARGUMENTS] ??= {} as any
     joinerQuery[entity][ARGUMENTS] = {
       ...joinerQuery[entity][ARGUMENTS],
       ...config.pagination,
diff --git a/packages/core/types/src/modules-sdk/index.ts b/packages/core/types/src/modules-sdk/index.ts
index b9db5af72c..e953c9de25 100644
--- a/packages/core/types/src/modules-sdk/index.ts
+++ b/packages/core/types/src/modules-sdk/index.ts
@@ -25,7 +25,6 @@ export * from "./module-provider"
 export * from "./remote-query"
 export * from "./remote-query-entry-points"
 export * from "./to-remote-query"
-export * from "./query-filter"
 
 export type LogLevel =
   | "query"
diff --git a/packages/core/types/src/modules-sdk/query-filter.ts b/packages/core/types/src/modules-sdk/query-filter.ts
deleted file mode 100644
index 0571b90798..0000000000
--- a/packages/core/types/src/modules-sdk/query-filter.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { RemoteQueryFilters } from "./to-remote-query"
-
-export type QueryFilterType = {
-  <TEntry extends string>(
-    query: RemoteQueryFilters<TEntry>
-  ): RemoteQueryFilters<TEntry> & { __type: "QueryFilter" }
-
-  isQueryFilter: (obj: any) => boolean
-}
diff --git a/packages/core/utils/src/modules-sdk/index.ts b/packages/core/utils/src/modules-sdk/index.ts
index a4ce8a257e..d5542028da 100644
--- a/packages/core/utils/src/modules-sdk/index.ts
+++ b/packages/core/utils/src/modules-sdk/index.ts
@@ -16,6 +16,5 @@ export * from "./migration-scripts"
 export * from "./mikro-orm-cli-config-builder"
 export * from "./module"
 export * from "./query-context"
-export * from "./query-filter"
 export * from "./types/links-config"
 export * from "./types/medusa-service"
diff --git a/packages/core/utils/src/modules-sdk/query-filter.ts b/packages/core/utils/src/modules-sdk/query-filter.ts
deleted file mode 100644
index 9c8b9bb232..0000000000
--- a/packages/core/utils/src/modules-sdk/query-filter.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { RemoteQueryFilters } from "@medusajs/types"
-
-const __type = "QueryFilter"
-
-export function QueryFilterFn<TEntry extends string>(
-  query: RemoteQueryFilters<TEntry>
-): RemoteQueryFilters<TEntry> & { __type: "QueryFilter" } {
-  return {
-    ...query,
-    __type,
-  }
-}
-
-QueryFilterFn.isQueryFilter = (obj: any) => {
-  return obj.__type === __type
-}
-
-export const QueryFilter = QueryFilterFn