diff --git a/sdks/js/packages/core/react/components/common/upcoming-plan-change-banner/index.tsx b/sdks/js/packages/core/react/components/common/upcoming-plan-change-banner/index.tsx
index 31553fb6c..5c01dcaae 100644
--- a/sdks/js/packages/core/react/components/common/upcoming-plan-change-banner/index.tsx
+++ b/sdks/js/packages/core/react/components/common/upcoming-plan-change-banner/index.tsx
@@ -53,6 +53,7 @@ export function UpcomingPlanChangeBanner({
     async (planId: string) => {
       setIsPlanLoading(true);
       try {
+        // This API call can be moved to sdks/js/packages/core/react/components/organization/billing/index.tsx
         const resp = await client?.frontierServiceGetPlan(planId);
         const plan = resp?.data?.plan ?? {};
         if (plan) {
@@ -95,6 +96,7 @@ export function UpcomingPlanChangeBanner({
     setIsPlanChangeLoading(true);
     try {
       if (activeOrganization?.id && billingAccount?.id && subscription?.id) {
+        // This API call can be moved to sdks/js/packages/core/react/components/organization/billing/index.tsx
         const resp = await client?.frontierServiceChangeSubscription(
           activeOrganization?.id,
           billingAccount?.id,
diff --git a/sdks/js/packages/core/react/components/organization/billing/payment-method.tsx b/sdks/js/packages/core/react/components/organization/billing/payment-method.tsx
index d8d0214c2..2160dfd89 100644
--- a/sdks/js/packages/core/react/components/organization/billing/payment-method.tsx
+++ b/sdks/js/packages/core/react/components/organization/billing/payment-method.tsx
@@ -21,6 +21,7 @@ export const PaymentMethod = ({
   isAllowed,
   hideUpdatePaymentMethodBtn = false
 }: PaymentMethodProps) => {
+  // This is duplicated in the parent component sdks/js/packages/core/react/components/organization/billing/index.tsx
   const { client, config, billingAccount } = useFrontier();
   const [isActionLoading, setIsActionLoading] = useState(false);
   const {
diff --git a/sdks/js/packages/core/react/components/organization/billing/upcoming-billing-cycle.tsx b/sdks/js/packages/core/react/components/organization/billing/upcoming-billing-cycle.tsx
index 958530842..44502fce4 100644
--- a/sdks/js/packages/core/react/components/organization/billing/upcoming-billing-cycle.tsx
+++ b/sdks/js/packages/core/react/components/organization/billing/upcoming-billing-cycle.tsx
@@ -84,6 +84,7 @@ export const UpcomingBillingCycle = ({
   isPermissionLoading
 }: UpcomingBillingCycleProps) => {
   const [upcomingInvoice, setUpcomingInvoice] = useState<V1Beta1Invoice>();
+  // This hook call is duplicated in parent sdks/js/packages/core/react/components/organization/billing/index.tsx
   const {
     client,
     billingAccount,
diff --git a/sdks/js/packages/core/react/components/organization/general/general.workspace.tsx b/sdks/js/packages/core/react/components/organization/general/general.workspace.tsx
index cc1424d8f..e901b97f7 100644
--- a/sdks/js/packages/core/react/components/organization/general/general.workspace.tsx
+++ b/sdks/js/packages/core/react/components/organization/general/general.workspace.tsx
@@ -95,6 +95,7 @@ export const GeneralOrganization = ({
     if (!client) return;
     if (!organization?.id) return;
 
+    // This API call can be moved to sdks/js/packages/core/react/components/organization/general/index.tsx
     try {
       const resp = await client.frontierServiceUpdateOrganization(
         organization?.id,
diff --git a/sdks/js/packages/core/react/components/organization/plans/confirm-change/index.tsx b/sdks/js/packages/core/react/components/organization/plans/confirm-change/index.tsx
index c285aae9a..b1821b036 100644
--- a/sdks/js/packages/core/react/components/organization/plans/confirm-change/index.tsx
+++ b/sdks/js/packages/core/react/components/organization/plans/confirm-change/index.tsx
@@ -27,8 +27,7 @@ export default function ConfirmPlanChange() {
     client,
     fetchActiveSubsciption,
     activeSubscription,
-    basePlan,
-    allPlans
+    basePlan
   } = useFrontier();
   const [newPlan, setNewPlan] = useState<V1Beta1Plan>();
   const [isNewPlanLoading, setIsNewPlanLoading] = useState(false);
diff --git a/sdks/js/packages/core/react/components/organization/user/update.tsx b/sdks/js/packages/core/react/components/organization/user/update.tsx
index 3e4fca06c..1f174f78f 100644
--- a/sdks/js/packages/core/react/components/organization/user/update.tsx
+++ b/sdks/js/packages/core/react/components/organization/user/update.tsx
@@ -48,6 +48,7 @@ export const UpdateProfile = () => {
       if (!client) return;
       if (!user?.id) return;
 
+      // This API call can be moved to sdks/js/packages/core/react/components/organization/user/index.tsx
       const updatedUser = await client.frontierServiceUpdateCurrentUser(data);
       if (updatedUser?.data?.user) {
         setUser(updatedUser?.data?.user);