diff --git a/web/ce/components/workspace/upgrade/paid-plans-upgrade-modal.tsx b/web/ce/components/workspace/upgrade/paid-plans-upgrade-modal.tsx
index 5000071447..852021586d 100644
--- a/web/ce/components/workspace/upgrade/paid-plans-upgrade-modal.tsx
+++ b/web/ce/components/workspace/upgrade/paid-plans-upgrade-modal.tsx
@@ -5,8 +5,7 @@ import useSWR from "swr";
 import { CircleX } from "lucide-react";
 // types
 import { IPaymentProduct } from "@plane/types";
-// types
-// services
+// ui
 import { EModalWidth, ModalCore } from "@plane/ui";
 // plane web components
 import { cn } from "@/helpers/common.helper";
diff --git a/web/ee/components/mobile/authentication/forms/password.tsx b/web/ee/components/mobile/authentication/forms/password.tsx
index f6c8eb3442..cc7fafe9f3 100644
--- a/web/ee/components/mobile/authentication/forms/password.tsx
+++ b/web/ee/components/mobile/authentication/forms/password.tsx
@@ -4,10 +4,10 @@ import { FC, useEffect, useRef, useState } from "react";
 import { observer } from "mobx-react";
 import { Eye, EyeOff, XCircle } from "lucide-react";
 import { Button, Input, Spinner } from "@plane/ui";
-// hooks
 // helpers
 import { EAuthSteps } from "@/helpers/authentication.helper";
 import { API_BASE_URL } from "@/helpers/common.helper";
+// hooks
 import { useInstance } from "@/hooks/store";
 // services
 import { AuthService } from "@/services/auth.service";
diff --git a/web/ee/components/mobile/authentication/forms/unique-code.tsx b/web/ee/components/mobile/authentication/forms/unique-code.tsx
index 8c23f985dd..7275e34c5d 100644
--- a/web/ee/components/mobile/authentication/forms/unique-code.tsx
+++ b/web/ee/components/mobile/authentication/forms/unique-code.tsx
@@ -4,12 +4,12 @@ import { FC, useEffect, useRef, useState } from "react";
 import { observer } from "mobx-react";
 import { CircleCheck, XCircle } from "lucide-react";
 import { Button, Input, Spinner } from "@plane/ui";
-// hooks
 // helpers
 import { EAuthSteps } from "@/helpers/authentication.helper";
 import { API_BASE_URL } from "@/helpers/common.helper";
-// services
+// hooks
 import useTimer from "@/hooks/use-timer";
+// services
 import { AuthService } from "@/services/auth.service";
 
 const authService = new AuthService();
@@ -95,7 +95,7 @@ export const MobileAuthUniqueCodeForm: FC<TMobileAuthUniqueCodeForm> = observer(
         event.preventDefault(); // Prevent form from submitting by default
         setIsSubmitting(true);
         await handleCSRFToken();
-        authFormRef.current && authFormRef.current.submit();
+        if (authFormRef.current) authFormRef.current.submit();
       }}
     >
       <input type="hidden" name="csrfmiddlewaretoken" />
diff --git a/web/ee/components/pages/editor/page-root.tsx b/web/ee/components/pages/editor/page-root.tsx
index 40e24911dd..ee1f0d7600 100644
--- a/web/ee/components/pages/editor/page-root.tsx
+++ b/web/ee/components/pages/editor/page-root.tsx
@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from "react";
 import { observer } from "mobx-react";
 import { useSearchParams } from "next/navigation";
 // plane editor
-import { EditorReadOnlyRefApi, EditorRefApi, useEditorMarkings } from "@plane/editor";
+import { EditorReadOnlyRefApi, EditorRefApi } from "@plane/editor";
 // plane types
 import { TPage } from "@plane/types";
 // plane ui
@@ -57,8 +57,6 @@ export const WorkspacePageRoot = observer((props: TPageRootProps) => {
     hasConnectionFailed,
     updatePageDescription: async (data) => await updateDescription(data),
   });
-  // editor markings hook
-  const { updateMarkings } = useEditorMarkings();
   // update query params
   const { updateQueryParams } = useQueryParams();
 
diff --git a/web/ee/components/pages/sidebar/list.tsx b/web/ee/components/pages/sidebar/list.tsx
index 9e225250e4..15b669b303 100644
--- a/web/ee/components/pages/sidebar/list.tsx
+++ b/web/ee/components/pages/sidebar/list.tsx
@@ -9,13 +9,13 @@ import { Disclosure, Transition } from "@headlessui/react";
 // plane types
 import { TPage, TPageNavigationTabs } from "@plane/types";
 // plane ui
-import { ArchiveIcon, Tooltip, setToast, TOAST_TYPE } from "@plane/ui";
+import { ArchiveIcon, setToast, TOAST_TYPE, Tooltip } from "@plane/ui";
 // constants
 import { EPageAccess } from "@/constants/page";
 // helpers
 import { cn } from "@/helpers/common.helper";
 // hooks
-import { useAppTheme, useCommandPalette, useEventTracker } from "@/hooks/store";
+import { useAppTheme, useEventTracker } from "@/hooks/store";
 // plane web components
 import { PagesAppSidebarListItem } from "@/plane-web/components/pages";
 // plane web hooks
@@ -30,7 +30,6 @@ export const PagesAppSidebarList = observer(() => {
   // store hooks
   const { sidebarCollapsed } = useAppTheme();
   const { setTrackElement } = useEventTracker();
-  const { toggleCreatePageModal } = useCommandPalette();
   const { getCurrentWorkspacePageIdsByType, createPage } = useWorkspacePages();
   // derived values
   const isCollapsed = sidebarCollapsed || false;
diff --git a/web/ee/components/workspace/activation-modal.tsx b/web/ee/components/workspace/activation-modal.tsx
index a869e4d10d..420bbe7198 100644
--- a/web/ee/components/workspace/activation-modal.tsx
+++ b/web/ee/components/workspace/activation-modal.tsx
@@ -3,13 +3,13 @@
 import { FC, useState, FormEvent } from "react";
 import { observer } from "mobx-react";
 import { useParams } from "next/navigation";
-import { cn } from "@plane/editor";
 import { Button, EModalWidth, Input, ModalCore, setToast, TOAST_TYPE } from "@plane/ui";
 // components
 import { WorkspaceLogo } from "@/components/workspace";
 // helpers
-import { getFileURL } from "@/helpers/file.helper";
+import { cn } from "@/helpers/common.helper";
 // hooks
+import { getFileURL } from "@/helpers/file.helper";
 import { useUserPermissions, useWorkspace } from "@/hooks/store";
 // plane web constants
 import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
diff --git a/web/ee/components/workspace/billing/plans-comparison.tsx b/web/ee/components/workspace/billing/plans-comparison.tsx
index 21cf49290e..24d7efb9c1 100644
--- a/web/ee/components/workspace/billing/plans-comparison.tsx
+++ b/web/ee/components/workspace/billing/plans-comparison.tsx
@@ -8,11 +8,12 @@ import { TProductSubscriptionType } from "@plane/types";
 // ui
 import { Button, Loader } from "@plane/ui";
 // constants
-import { ComingSoonBadge, PLANE_PLANS, TPlanDetail, TPlanePlans, TPlanFeatureData } from "@/constants/plans";
 // helpers
 import { cn } from "@/helpers/common.helper";
 // plane web components
 import { calculateYearlyDiscount } from "@/plane-web/components/license";
+// plane web constants
+import { ComingSoonBadge, PLANE_PLANS, TPlanDetail, TPlanePlans, TPlanFeatureData } from "@/plane-web/constants/plans";
 // plane web hooks
 import { useWorkspaceSubscription } from "@/plane-web/hooks/store";
 
diff --git a/web/core/constants/plans.tsx b/web/ee/constants/plans.tsx
similarity index 100%
rename from web/core/constants/plans.tsx
rename to web/ee/constants/plans.tsx
diff --git a/web/ee/store/issue/issue-details/activity.store.ts b/web/ee/store/issue/issue-details/activity.store.ts
index 2f9ac837f8..b2b03359f7 100644
--- a/web/ee/store/issue/issue-details/activity.store.ts
+++ b/web/ee/store/issue/issue-details/activity.store.ts
@@ -17,9 +17,9 @@ import { IssueActivityService } from "@/services/issue";
 
 export type TActivityLoader = "fetch" | "mutate" | undefined;
 
-export interface IIssueActivityStoreActions extends IIssueActivityStoreActionsCe {}
+export type IIssueActivityStoreActions = IIssueActivityStoreActionsCe;
 
-export interface IIssueActivityStore extends IIssueActivityStoreCe {}
+export type IIssueActivityStore = IIssueActivityStoreCe;
 
 export class IssueActivityStore extends IssueActivityStoreCe implements IIssueActivityStore {
   // services