diff --git a/packages/app-store/constants.ts b/packages/app-store/constants.ts
index ab3cd2d5fb4ed0..82f692c832e5c3 100644
--- a/packages/app-store/constants.ts
+++ b/packages/app-store/constants.ts
@@ -1,3 +1,12 @@
+import type { AppCategories } from "@prisma/client";
+
 export const MeetLocationType = "integrations:google:meet";
 
 export const MSTeamsLocationType = "integrations:office365_video";
+
+export const defaultVideoAppCategories: AppCategories[] = [
+  "messaging",
+  "conferencing",
+  // Legacy name for conferencing
+  "video",
+];
diff --git a/packages/app-store/routing-forms/trpc/formMutation.handler.ts b/packages/app-store/routing-forms/trpc/formMutation.handler.ts
index c60f83006b0807..b7a7276f0c4f0b 100644
--- a/packages/app-store/routing-forms/trpc/formMutation.handler.ts
+++ b/packages/app-store/routing-forms/trpc/formMutation.handler.ts
@@ -12,7 +12,6 @@ import { TRPCError } from "@trpc/server";
 import { createFallbackRoute } from "../lib/createFallbackRoute";
 import { getSerializableForm } from "../lib/getSerializableForm";
 import { isFallbackRoute } from "../lib/isFallbackRoute";
-import { isFormCreateEditAllowed } from "../lib/isFormCreateEditAllowed";
 import isRouter from "../lib/isRouter";
 import isRouterLinkedField from "../lib/isRouterLinkedField";
 import type { SerializableForm } from "../types/types";
diff --git a/packages/app-store/routing-forms/trpc/formQuery.handler.ts b/packages/app-store/routing-forms/trpc/formQuery.handler.ts
index f518b02a71a008..f58fa602626a38 100644
--- a/packages/app-store/routing-forms/trpc/formQuery.handler.ts
+++ b/packages/app-store/routing-forms/trpc/formQuery.handler.ts
@@ -3,8 +3,6 @@ import type { PrismaClient } from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { TrpcSessionUser } from "@calcom/trpc/server/types";
 
-import { TRPCError } from "@trpc/server";
-
 import { getSerializableForm } from "../lib/getSerializableForm";
 import type { TFormQueryInputSchema } from "./formQuery.schema";
 import { checkPermissionOnExistingRoutingForm } from "./permissions";
diff --git a/packages/app-store/routing-forms/trpc/permissions.ts b/packages/app-store/routing-forms/trpc/permissions.ts
index 042533551d1310..85286257df8e67 100644
--- a/packages/app-store/routing-forms/trpc/permissions.ts
+++ b/packages/app-store/routing-forms/trpc/permissions.ts
@@ -1,7 +1,7 @@
 import type { PermissionString } from "@calcom/features/pbac/domain/types/permission-registry";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { PrismaRoutingFormRepository } from "@calcom/lib/server/repository/PrismaRoutingFormRepository";
-import { MembershipRole } from "@calcom/prisma/enums";
+import type { MembershipRole } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
 
diff --git a/packages/app-store/server.ts b/packages/app-store/server.ts
index 30556d5f2e68a2..faa82683c62d83 100644
--- a/packages/app-store/server.ts
+++ b/packages/app-store/server.ts
@@ -1,7 +1,7 @@
 import type { Prisma } from "@prisma/client";
 import type { TFunction } from "i18next";
 
-import { defaultVideoAppCategories } from "@calcom/app-store/utils";
+import { defaultVideoAppCategories } from "@calcom/app-store/constants";
 import getEnabledAppsFromCredentials from "@calcom/lib/apps/getEnabledAppsFromCredentials";
 import {
   buildNonDelegationCredentials,
diff --git a/packages/app-store/utils.ts b/packages/app-store/utils.ts
index 0c48c600d0a70b..f72396fefa0616 100644
--- a/packages/app-store/utils.ts
+++ b/packages/app-store/utils.ts
@@ -1,8 +1,7 @@
 import type { AppCategories } from "@prisma/client";
 
-// If you import this file on any app it should produce circular dependency
-// import appStore from "./index";
 import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
+import { defaultVideoAppCategories } from "@calcom/app-store/constants";
 import type { EventLocationType } from "@calcom/app-store/locations";
 import logger from "@calcom/lib/logger";
 import { getPiiFreeCredential } from "@calcom/lib/piiFreeData";
@@ -19,6 +18,12 @@ export type LocationOption = {
   disabled?: boolean;
 };
 
+export type CredentialDataWithTeamName = CredentialForCalendarService & {
+  team?: {
+    name: string;
+  } | null;
+};
+
 const ALL_APPS_MAP = Object.keys(appStoreMetadata).reduce((store, key) => {
   const metadata = appStoreMetadata[key as keyof typeof appStoreMetadata] as AppMeta;
 
@@ -33,12 +38,6 @@ const ALL_APPS_MAP = Object.keys(appStoreMetadata).reduce((store, key) => {
   return store;
 }, {} as Record<string, AppMeta>);
 
-export type CredentialDataWithTeamName = CredentialForCalendarService & {
-  team?: {
-    name: string;
-  } | null;
-};
-
 export const ALL_APPS = Object.values(ALL_APPS_MAP);
 
 /**
@@ -168,11 +167,5 @@ export function doesAppSupportTeamInstall({
 export function isConferencing(appCategories: string[]) {
   return appCategories.some((category) => category === "conferencing" || category === "video");
 }
-export const defaultVideoAppCategories: AppCategories[] = [
-  "messaging",
-  "conferencing",
-  // Legacy name for conferencing
-  "video",
-];
 
 export default getApps;
diff --git a/packages/prisma/zod/custom/booking.ts b/packages/prisma/zod/custom/booking.ts
index b2986cd8fc1e66..98d12de39f5860 100644
--- a/packages/prisma/zod/custom/booking.ts
+++ b/packages/prisma/zod/custom/booking.ts
@@ -1,7 +1,6 @@
 // `responses` is merged with it during handleNewBooking call because `responses` schema is dynamic and depends on eventType
 import z, { ZodNullable, ZodObject, ZodOptional } from "zod";
 import { timeZoneSchema } from "@calcom/lib/dayjs/timeZone.schema";
-// TODO: Move this out of here. Importing from app-store is a circular package dependency.
 import { routingFormResponseInDbSchema } from "@calcom/app-store/routing-forms/zod";
 import { CreationSource } from "@calcom/prisma/enums";