diff --git a/src/lib/components/support.svelte b/src/lib/components/support.svelte
index 892274cac..85f613e8a 100644
--- a/src/lib/components/support.svelte
+++ b/src/lib/components/support.svelte
@@ -4,11 +4,12 @@
     import SupportOfflineDark from '$lib/images/support/support-offline-dark.png';
     import SupportOnlineLight from '$lib/images/support/support-online-light.png';
     import SupportOnlineDark from '$lib/images/support/support-online-dark.png';
-    import { app, isFreeTier } from '$lib/stores/app';
+    import { app } from '$lib/stores/app';
     import { wizard } from '$lib/stores/wizard';
     import SupportWizard from '../../routes/console/supportWizard.svelte';
-    import { isSupportOnline } from '../../routes/console/wizard/store';
+    import { isSupportOnline } from '../../routes/console/wizard/support/store';
     import { isCloud } from '$lib/system';
+    import { organization } from '$lib/stores/organization';
 
     export let show = false;
 </script>
@@ -34,7 +35,7 @@
                 Get personalized support from the Appwrite team from <b>09:00 - 17:00 UTC</b>
             </p>
         </div>
-        {#if isFreeTier}
+        {#if $organization?.billingPlan === 'tier-0'}
             <Button fullWidth href="https://appwrite.io/billing">
                 <span class="text">Get Premium support</span>
             </Button>
diff --git a/src/lib/stores/app.ts b/src/lib/stores/app.ts
index b092b3456..11afe9d6a 100644
--- a/src/lib/stores/app.ts
+++ b/src/lib/stores/app.ts
@@ -1,6 +1,6 @@
 import { browser } from '$app/environment';
 import { VARS } from '$lib/system';
-import { get, writable } from 'svelte/store';
+import { writable } from 'svelte/store';
 
 export type AppStore = {
     theme: 'light' | 'dark' | 'auto';
@@ -15,22 +15,11 @@ export type Feedback = {
     show: boolean;
 };
 
-export enum Tier {
-    FREE = 'free',
-    PRO = 'pro',
-    ENTERPRISE = 'enterprise'
-}
-
 export const app = writable<AppStore>({
     theme: 'auto',
     themeInUse: 'light'
 });
 
-//TODO: once billing is enabled on organization load/update, update the tier
-export const tier = writable<Tier>(Tier.FREE);
-export const isFreeTier = get(tier) === Tier.FREE;
-export const isPaidTier = get(tier) === Tier.PRO || get(tier) === Tier.ENTERPRISE;
-
 function createFeedbackStore() {
     const { subscribe, update } = writable<Feedback>({
         elapsed: browser ? parseInt(localStorage.getItem('feedbackElapsed')) : 0,
diff --git a/src/routes/console/account/payments/deleteAddress.svelte b/src/routes/console/account/payments/deleteAddress.svelte
index a88338af0..5f02286ec 100644
--- a/src/routes/console/account/payments/deleteAddress.svelte
+++ b/src/routes/console/account/payments/deleteAddress.svelte
@@ -8,7 +8,7 @@
     // import { sdk } from '$lib/stores/sdk';
 
     export let showDelete = false;
-    export let selectedAddress: string;
+    // export let selectedAddress: string;
 
     async function handleDelete() {
         try {
diff --git a/src/routes/console/supportWizard.svelte b/src/routes/console/supportWizard.svelte
index 9dabc3c5b..d0424630a 100644
--- a/src/routes/console/supportWizard.svelte
+++ b/src/routes/console/supportWizard.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
     import { Wizard } from '$lib/layout';
     import { onDestroy } from 'svelte';
-    import { isSupportOnline, supportData } from './wizard/store';
-    import Step1 from './wizard/step1.svelte';
-    import Step2 from './wizard/step2.svelte';
+    import { isSupportOnline, supportData } from './wizard/support/store';
+    import Step1 from './wizard/support/step1.svelte';
+    import Step2 from './wizard/support/step2.svelte';
     import type { WizardStepsType } from '$lib/layout/wizard.svelte';
 
     onDestroy(() => {
diff --git a/src/routes/console/wizard/step1.svelte b/src/routes/console/wizard/support/step1.svelte
similarity index 100%
rename from src/routes/console/wizard/step1.svelte
rename to src/routes/console/wizard/support/step1.svelte
diff --git a/src/routes/console/wizard/step2.svelte b/src/routes/console/wizard/support/step2.svelte
similarity index 100%
rename from src/routes/console/wizard/step2.svelte
rename to src/routes/console/wizard/support/step2.svelte
diff --git a/src/routes/console/wizard/store.ts b/src/routes/console/wizard/support/store.ts
similarity index 100%
rename from src/routes/console/wizard/store.ts
rename to src/routes/console/wizard/support/store.ts