diff --git a/src/lib/components/archiveProject.svelte b/src/lib/components/archiveProject.svelte
deleted file mode 100644
index 8a324b395b..0000000000
--- a/src/lib/components/archiveProject.svelte
+++ /dev/null
@@ -1,379 +0,0 @@
-<script lang="ts">
-    import PaginationWithLimit from './paginationWithLimit.svelte';
-    import { Button, InputText } from '$lib/elements/forms';
-    import { GridItem1, CardContainer, Modal } from '$lib/components';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
-    import {
-        Badge,
-        Icon,
-        Typography,
-        Accordion,
-        ActionMenu,
-        Popover,
-        Layout,
-        Divider
-    } from '@appwrite.io/pink-svelte';
-    import {
-        IconAndroid,
-        IconApple,
-        IconCode,
-        IconFlutter,
-        IconReact,
-        IconUnity,
-        IconDotsHorizontal,
-        IconInboxIn,
-        IconSwitchHorizontal,
-        IconTrash
-    } from '@appwrite.io/pink-icons-svelte';
-    import { getPlatformInfo } from '$lib/helpers/platform';
-    import { Status, type Models } from '@appwrite.io/console';
-    import type { ComponentType } from 'svelte';
-    import { goto } from '$app/navigation';
-    import { base } from '$app/paths';
-    import { sdk } from '$lib/stores/sdk';
-    import { addNotification } from '$lib/stores/notifications';
-    import { invalidate } from '$app/navigation';
-    import { Dependencies } from '$lib/constants';
-
-    import { isSmallViewport } from '$lib/stores/viewport';
-    import { isCloud } from '$lib/system';
-    import { regions as regionsStore } from '$lib/stores/organization';
-
-    // props
-    interface Props {
-        currentPlan: Models.BillingPlan;
-        organization: Models.Organization;
-        projectsToArchive: Models.Project[];
-        archivedTotalOverall: number;
-        archivedOffset: number;
-        limit: number;
-    }
-
-    let {
-        currentPlan,
-        organization,
-        projectsToArchive,
-        archivedTotalOverall,
-        archivedOffset,
-        limit
-    }: Props = $props();
-
-    // Check if current plan order is less than Pro (order < 1 means FREE plan)
-    let isPlanBelowPro = $derived(currentPlan?.order < 1);
-
-    let showUnarchiveModal = $state(false);
-    let projectToUnarchive = $state<Models.Project | null>(null);
-    let showDeleteModal = $state(false);
-    let projectToDelete = $state<Models.Project | null>(null);
-    let deleteProjectName = $state<string | null>(null);
-    let deleteError = $state<string | null>(null);
-
-    function resetDeleteState() {
-        showDeleteModal = false;
-        projectToDelete = null;
-        deleteProjectName = null;
-        deleteError = null;
-    }
-
-    function filterPlatforms(platforms: { name: string; icon: string }[]) {
-        return platforms.filter(
-            (value, index, self) => index === self.findIndex((t) => t.name === value.name)
-        );
-    }
-
-    function getIconForPlatform(platform: string): ComponentType {
-        switch (platform) {
-            case 'code':
-                return IconCode;
-            case 'flutter':
-                return IconFlutter;
-            case 'apple':
-                return IconApple;
-            case 'android':
-                return IconAndroid;
-            case 'react-native':
-                return IconReact;
-            case 'unity':
-                return IconUnity;
-            default:
-                return IconCode;
-        }
-    }
-
-    // Check if unarchive should be disabled
-    function isUnarchiveDisabled(): boolean {
-        if (!organization || !currentPlan) return true;
-
-        if (isPlanBelowPro) {
-            const currentProjectCount = organization.projects?.length || 0;
-            const projectLimit = currentPlan.projects || 0;
-
-            return currentProjectCount >= projectLimit;
-        }
-
-        return false;
-    }
-
-    function handleMigrateProject(project: Models.Project) {
-        goto(`${base}/project-${project.region}-${project.$id}/settings/migrations`);
-    }
-
-    // Handle unarchive project action
-    async function handleUnarchiveProject(project: Models.Project) {
-        projectToUnarchive = project;
-        showUnarchiveModal = true;
-    }
-
-    function handleDeleteProject(project: Models.Project) {
-        projectToDelete = project;
-        deleteProjectName = null;
-        showDeleteModal = true;
-    }
-
-    // Confirm unarchive action
-    async function confirmUnarchive() {
-        if (!projectToUnarchive) return;
-
-        try {
-            if (!organization) {
-                addNotification({
-                    type: 'error',
-                    message: 'Organization not found'
-                });
-                return;
-            }
-
-            await sdk.forConsole.projects.updateStatus(projectToUnarchive.$id, Status.Active);
-
-            await invalidate(Dependencies.ORGANIZATION);
-
-            addNotification({
-                type: 'success',
-                message: `${projectToUnarchive.name} has been unarchived`
-            });
-
-            showUnarchiveModal = false;
-            projectToUnarchive = null;
-        } catch (error) {
-            const msg =
-                error && typeof error === 'object' && 'message' in error
-                    ? String((error as { message: string }).message)
-                    : 'Failed to unarchive project';
-            addNotification({ type: 'error', message: msg });
-        }
-    }
-
-    function cancelUnarchive() {
-        showUnarchiveModal = false;
-        projectToUnarchive = null;
-    }
-
-    async function confirmDelete() {
-        if (!projectToDelete) return;
-
-        try {
-            await sdk.forConsoleIn(projectToDelete.region).projects.delete({
-                projectId: projectToDelete.$id
-            });
-
-            await invalidate(Dependencies.ORGANIZATION);
-
-            trackEvent(Submit.ProjectDelete);
-            addNotification({
-                type: 'success',
-                message: `${projectToDelete.name} has been deleted`
-            });
-
-            resetDeleteState();
-        } catch (error) {
-            deleteError = error.message;
-            trackError(error, Submit.ProjectDelete);
-        }
-    }
-
-    function findRegion(project: Models.Project) {
-        return $regionsStore.regions.find((region) => region.$id === project.region);
-    }
-
-    import { formatName as formatNameHelper } from '$lib/helpers/string';
-    function formatName(name: string, limit: number = 16) {
-        return formatNameHelper(name, limit, $isSmallViewport);
-    }
-</script>
-
-{#if projectsToArchive.length > 0}
-    <div class="archive-projects-margin-top">
-        <Accordion
-            title={isPlanBelowPro ? 'Archived projects' : 'Pending archive'}
-            badge={`${archivedTotalOverall}`}>
-            <Typography.Text tag="p" size="s">
-                {#if isPlanBelowPro}
-                    These projects are archived and require a plan upgrade to restore access.
-                {:else}
-                    These projects will be archived at the end of your billing cycle.
-                {/if}
-            </Typography.Text>
-
-            <div class="archive-projects-margin">
-                <CardContainer disableEmpty={true} total={archivedTotalOverall}>
-                    {#each projectsToArchive as project}
-                        {@const platforms = filterPlatforms(
-                            project.platforms.map((platform) => getPlatformInfo(platform.type))
-                        )}
-                        {@const formatted = formatName(project.name)}
-                        <GridItem1>
-                            <svelte:fragment slot="eyebrow">
-                                {project?.platforms?.length ? project?.platforms?.length : 'No'} apps
-                            </svelte:fragment>
-                            <svelte:fragment slot="title">{formatted}</svelte:fragment>
-                            <svelte:fragment slot="status">
-                                <div class="status-container">
-                                    <Popover let:toggle padding="none" placement="bottom-end">
-                                        <Button
-                                            text
-                                            icon
-                                            size="s"
-                                            ariaLabel="more options"
-                                            on:click={(e) => {
-                                                e.preventDefault();
-                                                e.stopPropagation();
-                                                toggle(e);
-                                            }}>
-                                            <Icon icon={IconDotsHorizontal} size="s" />
-                                        </Button>
-                                        <ActionMenu.Root slot="tooltip">
-                                            <ActionMenu.Item.Button
-                                                leadingIcon={IconInboxIn}
-                                                disabled={isUnarchiveDisabled()}
-                                                on:click={() => handleUnarchiveProject(project)}
-                                                >Unarchive project</ActionMenu.Item.Button>
-                                            <ActionMenu.Item.Button
-                                                leadingIcon={IconSwitchHorizontal}
-                                                disabled={isUnarchiveDisabled()}
-                                                on:click={() => handleMigrateProject(project)}
-                                                >Migrate project</ActionMenu.Item.Button>
-                                            <div class="action-menu-divider">
-                                                <Divider />
-                                            </div>
-                                            <ActionMenu.Item.Button
-                                                status="danger"
-                                                leadingIcon={IconTrash}
-                                                on:click={() => handleDeleteProject(project)}
-                                                >Delete project</ActionMenu.Item.Button>
-                                        </ActionMenu.Root>
-                                    </Popover>
-                                </div>
-                            </svelte:fragment>
-
-                            {#each platforms.slice(0, 2) as platform}
-                                {@const icon = getIconForPlatform(platform.icon)}
-                                <Badge
-                                    variant="secondary"
-                                    content={platform.name}
-                                    style="width: max-content;">
-                                    <Icon {icon} size="s" slot="start" />
-                                </Badge>
-                            {/each}
-
-                            {#if platforms.length > 2}
-                                <Badge
-                                    variant="secondary"
-                                    content={`+${platforms.length - 2}`}
-                                    style="width: max-content;" />
-                            {/if}
-
-                            <svelte:fragment slot="icons">
-                                {#if isCloud && $regionsStore?.regions}
-                                    {@const region = findRegion(project)}
-                                    <Typography.Text>{region?.name}</Typography.Text>
-                                {/if}
-                            </svelte:fragment>
-                        </GridItem1>
-                    {/each}
-                </CardContainer>
-
-                <PaginationWithLimit
-                    name="Archived Projects"
-                    {limit}
-                    offset={archivedOffset}
-                    total={archivedTotalOverall}
-                    pageParam="archivedPage"
-                    removeOnFirstPage
-                    class="pagination-container" />
-            </div>
-        </Accordion>
-    </div>
-{/if}
-
-<!-- Unarchive Confirmation Modal -->
-<Modal bind:show={showUnarchiveModal} title="Unarchive project" size="s">
-    <p>Are you sure you want to unarchive <strong>{projectToUnarchive?.name}</strong>?</p>
-    <p>This will move the project back to your active projects list.</p>
-
-    <svelte:fragment slot="footer">
-        <Layout.Stack direction="row" gap="s" justifyContent="flex-end">
-            <Button secondary on:click={cancelUnarchive}>Cancel</Button>
-            <Button on:click={confirmUnarchive}>Unarchive</Button>
-        </Layout.Stack>
-    </svelte:fragment>
-</Modal>
-
-<!-- Delete Confirmation Modal -->
-<Modal
-    size="s"
-    bind:show={showDeleteModal}
-    title="Delete project"
-    onSubmit={confirmDelete}
-    bind:error={deleteError}>
-    <svelte:fragment slot="description">
-        The archived project <strong>{projectToDelete?.name}</strong> will be deleted along with all
-        of its metadata, stats, and other resources.
-        <b>This action is irreversible.</b>
-    </svelte:fragment>
-
-    <InputText
-        label={`Enter "${projectToDelete?.name}" to continue`}
-        placeholder="Enter name"
-        id="delete-project-name"
-        autofocus
-        required
-        bind:value={deleteProjectName} />
-
-    <svelte:fragment slot="footer">
-        <Button
-            text
-            on:click={() => {
-                resetDeleteState();
-            }}>Cancel</Button>
-        <Button
-            submissionLoader
-            submit
-            disabled={(deleteProjectName ?? '') !== projectToDelete?.name}>
-            Delete
-        </Button>
-    </svelte:fragment>
-</Modal>
-
-<style>
-    .archive-projects-margin-top {
-        margin-top: 36px;
-    }
-    .action-menu-divider {
-        margin-inline: -1rem;
-        padding-block-start: 0.25rem;
-        padding-block-end: 0.25rem;
-    }
-
-    .archive-projects-margin {
-        margin-top: 16px;
-        margin-bottom: 36px;
-    }
-    .status-container {
-        display: flex;
-        align-items: center;
-        gap: 8px;
-    }
-    :global(.pagination-container) {
-        margin-top: 16px;
-    }
-</style>
diff --git a/src/lib/components/billing/alerts/projectsLimit.svelte b/src/lib/components/billing/alerts/projectsLimit.svelte
deleted file mode 100644
index 493e445107..0000000000
--- a/src/lib/components/billing/alerts/projectsLimit.svelte
+++ /dev/null
@@ -1,53 +0,0 @@
-<script lang="ts">
-    import { page } from '$app/state';
-    import { Click } from '$lib/actions/analytics';
-    import { Button } from '$lib/elements/forms';
-    import { HeaderAlert } from '$lib/layout';
-    import { hideBillingHeaderRoutes, getChangePlanUrl } from '$lib/stores/billing';
-    import { currentPlan, organization } from '$lib/stores/organization';
-    import SelectProjectCloud from './selectProjectCloud.svelte';
-    import { toLocaleDate } from '$lib/helpers/date';
-
-    let selectedProjects: string[] = $state([]);
-    let showSelectProject: boolean = $state(false);
-
-    const organizationId = $derived(page.data.organization?.$id);
-
-    $effect(() => {
-        if (organizationId) {
-            selectedProjects = page.data.organization?.projects || [];
-        }
-    });
-</script>
-
-<SelectProjectCloud bind:showSelectProject bind:selectedProjects {organizationId} />
-
-{#if organizationId && $currentPlan && $currentPlan.projects > 0 && !hideBillingHeaderRoutes.includes(page.url.pathname)}
-    <HeaderAlert
-        type="warning"
-        title="Action required: You have more than {$currentPlan.projects} projects.">
-        <svelte:fragment>
-            Choose which projects to keep before {toLocaleDate(
-                $organization.billingNextInvoiceDate
-            )} or upgrade to Pro. Projects over the limit will be blocked after this date.
-        </svelte:fragment>
-        <svelte:fragment slot="buttons">
-            <Button
-                compact
-                on:click={() => {
-                    showSelectProject = true;
-                }}>Manage projects</Button>
-            <Button
-                href={getChangePlanUrl(organizationId)}
-                event={Click.OrganizationClickUpgrade}
-                eventData={{
-                    from: 'button',
-                    source: 'projects_limit_banner'
-                }}
-                secondary
-                fullWidthMobile>
-                <span class="text">Upgrade</span>
-            </Button>
-        </svelte:fragment>
-    </HeaderAlert>
-{/if}
diff --git a/src/lib/components/billing/alerts/selectProjectCloud.svelte b/src/lib/components/billing/alerts/selectProjectCloud.svelte
deleted file mode 100644
index a0084f97ab..0000000000
--- a/src/lib/components/billing/alerts/selectProjectCloud.svelte
+++ /dev/null
@@ -1,180 +0,0 @@
-<script lang="ts">
-    import { type Models, Query } from '@appwrite.io/console';
-    import { Alert, Button, Skeleton, Table } from '@appwrite.io/pink-svelte';
-    import { Modal } from '$lib/components';
-    import { sdk } from '$lib/stores/sdk';
-    import { addNotification } from '$lib/stores/notifications';
-    import { invalidate } from '$app/navigation';
-    import { Dependencies } from '$lib/constants';
-    import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
-    import { currentPlan, organization } from '$lib/stores/organization';
-
-    let {
-        showSelectProject = $bindable(false),
-        selectedProjects = $bindable([]),
-        organizationId
-    }: {
-        showSelectProject: boolean;
-        selectedProjects: string[];
-        organizationId: string;
-    } = $props();
-
-    let loading = $state(false);
-    let projectsLoadingError = $state<string | null>(null);
-
-    let error = $state<string | null>(null);
-    let projects = $state<Array<Models.Project>>([]);
-
-    let projectsToArchive = $derived(
-        projects.filter((project) => !selectedProjects.includes(project.$id))
-    );
-
-    async function updateSelected() {
-        try {
-            await sdk.forConsole.organizations.updateProjects({
-                organizationId,
-                projects: selectedProjects
-            });
-
-            showSelectProject = false;
-            invalidate(Dependencies.ORGANIZATION);
-            addNotification({
-                type: 'success',
-                message: `Projects updated for archiving`
-            });
-        } catch (e) {
-            error = e.message;
-        }
-    }
-
-    function formatProjectsToArchive() {
-        let result = '';
-
-        projectsToArchive.forEach((project, index) => {
-            const text = `${index === 0 ? '' : ' '}<b>${project.name}</b> `;
-            result += text;
-
-            if (index < projectsToArchive.length - 1) {
-                if (index == projectsToArchive.length - 2) {
-                    result += 'and ';
-                }
-                if (index < projectsToArchive.length - 2) {
-                    result += ', ';
-                }
-            }
-        });
-
-        return result;
-    }
-
-    $effect(() => {
-        if (!showSelectProject) return;
-
-        const areProjectsLoaded = projects.length > 0;
-        const teamIdInLoadedProjects = areProjectsLoaded ? projects[0].teamId : null;
-
-        if (organizationId != teamIdInLoadedProjects) {
-            loading = true;
-
-            sdk.forConsole.projects
-                .list({
-                    queries: [
-                        Query.equal('teamId', organizationId),
-                        Query.limit(1000) // Get all projects for organization
-                    ]
-                })
-                .then((loadedProjects) => (projects = loadedProjects.projects))
-                .catch((err) => (projectsLoadingError = err.message))
-                .finally(() => (loading = false));
-        }
-    });
-</script>
-
-<Modal bind:show={showSelectProject} title="Manage projects" onSubmit={updateSelected}>
-    <svelte:fragment slot="description">
-        Choose which {$currentPlan?.projects || 2} projects to keep. Projects over the limit will be
-        blocked after this date.
-    </svelte:fragment>
-
-    {#if loading}
-        <div class="skeleton-projects">
-            <Table.Root let:root allowSelection columns={[{ id: 'name' }, { id: 'created' }]}>
-                <svelte:fragment slot="header" let:root>
-                    <Table.Header.Cell column="name" {root}>Project Name</Table.Header.Cell>
-                    <Table.Header.Cell column="created" {root}>Created</Table.Header.Cell>
-                </svelte:fragment>
-
-                {#each Array.from({ length: 5 }) as _}
-                    <Table.Row.Base {root} select="disabled">
-                        <Table.Cell column="name" {root}>
-                            <Skeleton variant="line" height={20} width="80%" />
-                        </Table.Cell>
-                        <Table.Cell column="created" {root}>
-                            <Skeleton variant="line" height={20} width="80%" />
-                        </Table.Cell>
-                    </Table.Row.Base>
-                {/each}
-            </Table.Root>
-        </div>
-    {:else if projectsLoadingError}
-        <Alert.Inline status="error" title="Error">{projectsLoadingError}</Alert.Inline>
-    {:else}
-        {#if error}
-            <Alert.Inline status="error" title="Error">{error}</Alert.Inline>
-        {/if}
-
-        <Table.Root
-            let:root
-            allowSelection
-            bind:selectedRows={selectedProjects}
-            columns={[{ id: 'name' }, { id: 'created' }]}>
-            <svelte:fragment slot="header" let:root>
-                <Table.Header.Cell column="name" {root}>Project Name</Table.Header.Cell>
-                <Table.Header.Cell column="created" {root}>Created</Table.Header.Cell>
-            </svelte:fragment>
-            {#each projects as project}
-                <Table.Row.Base {root} id={project.$id}>
-                    <Table.Cell column="name" {root}>{project.name}</Table.Cell>
-                    <Table.Cell column="created" {root}
-                        >{toLocaleDateTime(project.$createdAt)}</Table.Cell>
-                </Table.Row.Base>
-            {/each}
-        </Table.Root>
-
-        {#if selectedProjects.length > $currentPlan?.projects}
-            <div class="u-text-warning u-mb-4">
-                You can only select {$currentPlan?.projects} projects. Please deselect others to continue.
-            </div>
-        {/if}
-
-        {#if selectedProjects.length === $currentPlan?.projects}
-            {@const difference = projects.length - selectedProjects.length}
-            {@const messagePrefix =
-                difference > 1 ? `${difference} projects` : `${difference} project`}
-            <Alert.Inline
-                status="warning"
-                title={`${messagePrefix} will be archived on ${toLocaleDate($organization.billingNextInvoiceDate)}`}>
-                <span>
-                    {@html formatProjectsToArchive()}
-                    will be archived.
-                </span>
-            </Alert.Inline>
-        {/if}
-    {/if}
-    <svelte:fragment slot="footer">
-        <Button.Button size="s" variant="secondary" on:click={() => (showSelectProject = false)}
-            >Cancel</Button.Button>
-        <Button.Button size="s" disabled={selectedProjects.length !== $currentPlan?.projects}
-            >Save</Button.Button>
-    </svelte:fragment>
-</Modal>
-
-<style lang="scss">
-    /* disable the top select all selector button */
-    .skeleton-projects :global([role='rowheader'] button) {
-        opacity: 0.4;
-        cursor: default;
-        pointer-events: none;
-        background: var(--bgcolor-neutral-tertiary);
-    }
-</style>
diff --git a/src/lib/components/organizationUsageLimits.svelte b/src/lib/components/organizationUsageLimits.svelte
index fc97c9b257..39ae9a1ea3 100644
--- a/src/lib/components/organizationUsageLimits.svelte
+++ b/src/lib/components/organizationUsageLimits.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { Button } from '$lib/elements/forms';
+    import { Button, InputText } from '$lib/elements/forms';
     import { getBasePlanFromGroup, getServiceLimit } from '$lib/stores/billing';
     import { Click, trackEvent } from '$lib/actions/analytics';
     import { Badge, Icon, Layout, Table, Typography, Tooltip } from '@appwrite.io/pink-svelte';
@@ -8,78 +8,64 @@
     import { formatNumberWithCommas } from '$lib/helpers/numbers';
     import { Modal } from '$lib/components';
     import { Alert } from '@appwrite.io/pink-svelte';
-    import { addNotification } from '$lib/stores/notifications';
-    import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date';
-    import { organization } from '$lib/stores/organization';
+    import { toLocaleDateTime } from '$lib/helpers/date';
     import { BillingPlanGroup, type Models } from '@appwrite.io/console';
-
-    // Props
-    type Props = {
+    import { sdk } from '$lib/stores/sdk';
+    import { addNotification } from '$lib/stores/notifications';
+    import { invalidate } from '$app/navigation';
+    import { Dependencies } from '$lib/constants';
+
+    let {
+        members = [],
+        storageUsage = 0,
+        projects = $bindable([])
+    }: {
         storageUsage?: number;
         projects?: Models.Project[];
         members?: Models.Membership[];
         organization: Models.Organization;
-    };
-
-    const { projects = [], members = [], storageUsage = 0 }: Props = $props();
+    } = $props();
 
     let showSelectProject = $state(false);
-    let selectedProjects = $state<string[]>([]);
     let error = $state<string | null>(null);
     let showSelectionReminder = $state(false);
+    let confirmationInput = $state('');
 
+    let isDeletingProjects = $state(false);
+    let selectedProjectsToDelete = $state<Array<string>>([]);
     const baseFreePlan = getBasePlanFromGroup(BillingPlanGroup.Starter);
 
     // Derived state using runes
-    let freePlanLimits = $derived({
+    const freePlanLimits = $derived({
         projects: baseFreePlan?.projects,
         members: getServiceLimit('members', null, baseFreePlan),
         storage: getServiceLimit('storage', null, baseFreePlan)
     });
 
     // When preparing to downgrade to Free, enforce Free plan limit locally (2)
-    let allowedProjectsToKeep = $derived(freePlanLimits.projects);
+    const allowedProjectsToKeep = $derived(freePlanLimits.projects);
 
-    let currentUsage = $derived({
+    const currentUsage = $derived({
         projects: projects?.length || 0,
         members: members?.length || 0,
         storage: storageUsage || 0
     });
 
-    let storageUsageGB = $derived(storageUsage / (1024 * 1024 * 1024));
+    const storageUsageGB = $derived(storageUsage / (1024 * 1024 * 1024));
 
-    let isLimitExceeded = $derived({
+    const isLimitExceeded = $derived({
         projects: currentUsage.projects > freePlanLimits.projects,
         members: currentUsage.members > freePlanLimits.members,
         storage: storageUsageGB > freePlanLimits.storage
     });
 
-    let excessUsage = $derived({
+    const excessUsage = $derived({
         projects: Math.max(0, currentUsage.projects),
         members: Math.max(0, currentUsage.members - freePlanLimits.members),
         storage: Math.max(0, storageUsageGB - freePlanLimits.storage)
     });
 
-    // projects that would be archived with the current selection
-    let projectsToArchive = $derived(
-        projects.filter((project) => !selectedProjects.includes(project.$id))
-    );
-
-    function formatProjectsToArchive(): string {
-        let result = '';
-        projectsToArchive.forEach((project, index) => {
-            const isLast = index === projectsToArchive.length - 1;
-            const isSecondLast = index === projectsToArchive.length - 2;
-
-            result += `${index === 0 ? '' : ' '}${project.name}`;
-
-            if (!isLast) {
-                if (isSecondLast) result += ' and';
-                else result += ',';
-            }
-        });
-        return result;
-    }
+    const isConfirmationValid = $derived(confirmationInput.trim() === 'I understand');
 
     function formatNumber(num: number): string {
         return formatNumberWithCommas(num);
@@ -91,33 +77,68 @@
         trackEvent(Click.OrganizationClickUpgrade, { source: 'usage_limits_manage_projects' });
     }
 
-    // Expose validation for parent to call before submitting downgrade
-    export function validateOrAlert(): boolean {
-        const filteredSelection = selectedProjects.filter((id) =>
-            projects.some((p) => p.$id === id)
-        );
-        const isValid = filteredSelection.length === allowedProjectsToKeep;
-        showSelectionReminder = !isValid && isLimitExceeded.projects;
-        return isValid;
-    }
+    async function deleteSelected() {
+        error = null;
+        isDeletingProjects = true;
 
-    export function getSelectedProjects(): string[] {
-        return selectedProjects.filter((id) => projects.some((p) => p.$id === id));
-    }
+        const excessBy = isLimitExceeded.projects ? projects.length - allowedProjectsToKeep : 0;
+        const isUnderLimitPostSelection = selectedProjectsToDelete.length >= excessBy;
 
-    function updateSelected() {
-        error = null;
-        const filteredSelection = selectedProjects.filter((id) =>
-            projects.some((p) => p.$id === id)
-        );
-        if (filteredSelection.length !== allowedProjectsToKeep) {
-            error = `You must select exactly ${allowedProjectsToKeep} projects to keep.`;
+        if (!isUnderLimitPostSelection) {
+            error = `You can keep a maximum ${allowedProjectsToKeep} projects on the selected plan.`;
             return;
         }
-        // Keep selection locally; parent flow will apply after plan change
-        showSelectProject = false;
-        showSelectionReminder = false;
-        addNotification({ type: 'success', message: `Projects selected for archiving` });
+
+        if (selectedProjectsToDelete?.length) {
+            const projectsDeletionPromises = selectedProjectsToDelete.map((projectId) => ({
+                projectId,
+                promise: sdk.forConsole.projects.delete({ projectId })
+            }));
+
+            try {
+                const results = await Promise.allSettled(
+                    projectsDeletionPromises.map((p) => p.promise)
+                );
+
+                const failed: string[] = [];
+                const successfullyDeleted: string[] = [];
+
+                results.forEach((result, index) => {
+                    const projectId = projectsDeletionPromises[index].projectId;
+                    if (result.status === 'fulfilled') {
+                        successfullyDeleted.push(projectId);
+                    } else {
+                        failed.push(projectId);
+                    }
+                });
+
+                if (successfullyDeleted.length > 0) {
+                    await invalidate(Dependencies.ORGANIZATION);
+
+                    addNotification({
+                        type: 'success',
+                        message: `${successfullyDeleted.length} project${successfullyDeleted.length !== 1 ? 's' : ''} deleted successfully`
+                    });
+                }
+
+                if (failed.length > 0) {
+                    error = `Failed to delete ${failed.length} project${failed.length !== 1 ? 's' : ''}`;
+                } else {
+                    confirmationInput = '';
+                    showSelectProject = false;
+                    selectedProjectsToDelete = [];
+                    showSelectionReminder = false;
+
+                    if (successfullyDeleted.length > 0) {
+                        projects = projects.filter((p) => !successfullyDeleted.includes(p.$id));
+                    }
+                }
+            } catch (exception) {
+                error = exception.message;
+            } finally {
+                isDeletingProjects = false;
+            }
+        }
     }
 </script>
 
@@ -220,11 +241,7 @@
                             </Typography.Text>
                         </Layout.Stack>
                     {:else}
-                        <Typography.Text color="--fgcolor-neutral-secondary">
-                            {formatNumber(currentUsage.members)} / {formatNumber(
-                                freePlanLimits.members
-                            )}
-                        </Typography.Text>
+                        <Typography.Text color="--fgcolor-neutral-secondary">N/A</Typography.Text>
                     {/if}
                 </Table.Cell>
                 <Table.Cell column="manage" {root}></Table.Cell>
@@ -259,54 +276,90 @@
 </Layout.Stack>
 
 {#if showSelectProject}
-    <Modal bind:show={showSelectProject} title="Manage projects" onSubmit={updateSelected}>
-        <svelte:fragment slot="description">
-            Choose which {freePlanLimits.projects} projects to keep. Projects over the limit will be
-            blocked after your billing cycle ends on {toLocaleDate(
-                $organization.billingNextInvoiceDate
-            )}.
-        </svelte:fragment>
+    {@const requiredToDelete = currentUsage.projects - allowedProjectsToKeep}
+    <Modal
+        bind:show={showSelectProject}
+        title="Delete projects to downgrade"
+        onSubmit={deleteSelected}
+        dismissible={false}>
+        <Typography.Text slot="description">
+            The Free plan lets you keep {allowedProjectsToKeep} projects. Select projects you want to
+            permanently delete.
+        </Typography.Text>
 
         {#if error}
             <Alert.Inline status="error" title="Error">{error}</Alert.Inline>
-        {/if}
-
-        <div>
-            <Table.Root
-                let:root
-                allowSelection
-                bind:selectedRows={selectedProjects}
-                columns={[{ id: 'name' }, { id: 'created' }]}>
-                <svelte:fragment slot="header" let:root>
-                    <Table.Header.Cell column="name" {root}>Project Name</Table.Header.Cell>
-                    <Table.Header.Cell column="created" {root}>Created</Table.Header.Cell>
-                </svelte:fragment>
-                {#each projects as project}
-                    <Table.Row.Base {root} id={project.$id}>
-                        <Table.Cell column="name" {root}
-                            ><Typography.Text truncate>{project.name}</Typography.Text></Table.Cell>
-                        <Table.Cell column="created" {root}>
-                            {toLocaleDateTime(project.$createdAt)}
-                        </Table.Cell>
-                    </Table.Row.Base>
-                {/each}
-            </Table.Root>
-        </div>
-        {#if selectedProjects.length === allowedProjectsToKeep}
-            {@const difference = projects.length - selectedProjects.length}
-            {@const messagePrefix =
-                difference > 1 ? `${difference} projects` : `${difference} project`}
+        {:else}
             <Alert.Inline
                 status="warning"
-                title={`${messagePrefix} will be archived on ${toLocaleDate($organization.billingNextInvoiceDate)}`}>
-                {formatProjectsToArchive()} will be archived
+                title="The selected projects will be permanently deleted">
+                The selected projects and all associated data will be permanently deleted and cannot
+                be recovered.
             </Alert.Inline>
         {/if}
 
+        <Layout.Stack gap="m">
+            <Layout.Stack gap="s" direction="row">
+                <Typography.Text
+                    >Select {requiredToDelete} project{requiredToDelete !== 1 ? 's' : ''} to delete</Typography.Text>
+
+                <Badge
+                    size="xs"
+                    variant="secondary"
+                    content={`${selectedProjectsToDelete.length} selected`} />
+            </Layout.Stack>
+
+            <div class="controlled-selection">
+                <Table.Root
+                    let:root
+                    allowSelection
+                    bind:selectedRows={selectedProjectsToDelete}
+                    columns={[{ id: 'name' }, { id: 'created' }]}>
+                    <svelte:fragment slot="header" let:root>
+                        <Table.Header.Cell column="name" {root}>Project Name</Table.Header.Cell>
+                        <Table.Header.Cell column="created" {root}>Created</Table.Header.Cell>
+                    </svelte:fragment>
+                    {#each projects as project}
+                        {@const isRowSelected = selectedProjectsToDelete.includes(project.$id)}
+                        {@const shouldDisable =
+                            !isRowSelected && selectedProjectsToDelete.length >= requiredToDelete}
+                        <Table.Row.Base
+                            {root}
+                            id={project.$id}
+                            select={shouldDisable ? 'disabled' : undefined}>
+                            <Table.Cell column="name" {root}
+                                ><Typography.Text truncate>{project.name}</Typography.Text
+                                ></Table.Cell>
+                            <Table.Cell column="created" {root}>
+                                {toLocaleDateTime(project.$createdAt)}
+                            </Table.Cell>
+                        </Table.Row.Base>
+                    {/each}
+                </Table.Root>
+            </div>
+        </Layout.Stack>
+
+        {#if selectedProjectsToDelete.length >= requiredToDelete}
+            <Layout.Stack gap="xs">
+                <InputText
+                    required
+                    id="confirmation"
+                    placeholder="I understand"
+                    disabled={isDeletingProjects}
+                    bind:value={confirmationInput}
+                    label={`Type "I understand" to confirm permanent deletion of the selected projects`} />
+            </Layout.Stack>
+        {/if}
+
         <svelte:fragment slot="footer">
             <Button secondary on:click={() => (showSelectProject = false)}>Cancel</Button>
-            <Button submit disabled={selectedProjects.length !== allowedProjectsToKeep}
-                >Save</Button>
+            <Button
+                submit
+                danger
+                submissionLoader
+                forceShowLoader={isDeletingProjects}
+                disabled={selectedProjectsToDelete.length < requiredToDelete ||
+                    !isConfirmationValid}>Delete projects</Button>
         </svelte:fragment>
     </Modal>
 {/if}
@@ -352,4 +405,14 @@
             min-width: 96px;
         }
     }
+
+    .controlled-selection :global([role='rowheader']) {
+        pointer-events: none;
+
+        :global([role='cell']) {
+            opacity: 0.5;
+            cursor: not-allowed;
+            color: var(--fgcolor-neutral-secondary);
+        }
+    }
 </style>
diff --git a/src/lib/stores/billing.ts b/src/lib/stores/billing.ts
index baf663114b..50e3a3071e 100644
--- a/src/lib/stores/billing.ts
+++ b/src/lib/stores/billing.ts
@@ -31,7 +31,6 @@ import { user } from './user';
 
 import BudgetLimitAlert from '$routes/(console)/organization-[organization]/budgetLimitAlert.svelte';
 import TeamReadonlyAlert from '$routes/(console)/organization-[organization]/teamReadonlyAlert.svelte';
-import ProjectsLimit from '$lib/components/billing/alerts/projectsLimit.svelte';
 import EnterpriseTrial from '$routes/(console)/organization-[organization]/enterpriseTrial.svelte';
 
 export const roles = [
@@ -368,32 +367,6 @@ export function calculateTrialDay(org: Models.Organization) {
     return days;
 }
 
-export async function checkForProjectsLimit(org: Models.Organization, orgProjectCount?: number) {
-    if (!isCloud) return;
-    if (!org) return;
-
-    const plan = await sdk.forConsole.organizations.getPlan({
-        organizationId: org.$id
-    });
-    if (!plan) return;
-
-    if (!org.projects) return;
-    if (org.projects.length > 0) return;
-
-    const projectCount = orgProjectCount;
-    if (projectCount === undefined) return;
-
-    // not unlimited and current exceeds plan limits!
-    if (plan.projects > 0 && projectCount > plan.projects) {
-        headerAlert.add({
-            id: 'projectsLimitReached',
-            component: ProjectsLimit,
-            show: true,
-            importance: 12
-        });
-    }
-}
-
 export async function checkForUsageLimit(organization: Models.Organization) {
     if (
         organization?.status === teamStatusReadonly &&
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index 1b0230829a..c7a11414c0 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -18,7 +18,6 @@
         checkForMarkedForDeletion,
         checkForMissingPaymentMethod,
         checkForNewDevUpgradePro,
-        checkForProjectsLimit,
         checkForUsageLimit,
         checkPaymentAuthorizationRequired,
         paymentExpired,
@@ -39,7 +38,7 @@
     import { showSupportModal } from './wizard/support/store';
     import { activeHeaderAlert, consoleVariables } from './store';
 
-    import { base } from '$app/paths';
+    import { base, resolve } from '$app/paths';
     import { headerAlert } from '$lib/stores/headerAlert';
     import { UsageRates } from '$lib/components/billing';
     import { canSeeProjects } from '$lib/stores/roles';
@@ -54,11 +53,8 @@
         IconSparkles,
         IconSwitchHorizontal
     } from '@appwrite.io/pink-icons-svelte';
-    import type { LayoutData } from './$types';
     import type { Models } from '@appwrite.io/console';
 
-    export let data: LayoutData;
-
     function kebabToSentenceCase(str: string) {
         return str
             .split('-')
@@ -75,9 +71,7 @@
     $: $registerCommands([
         {
             label: 'Go to Projects',
-            callback: () => {
-                goto(base);
-            },
+            callback: () => goto(resolve('/')),
             keys: ['g', 'p'],
             group: 'navigation',
             disabled:
@@ -296,9 +290,6 @@
         if (currentOrganizationId === org.$id) return;
         if (isCloud) {
             currentOrganizationId = org.$id;
-            const orgProjectCount =
-                data.currentOrgId === org.$id ? data.allProjectsCount : undefined;
-            await checkForProjectsLimit(org, orgProjectCount);
             checkForEnterpriseTrial(org);
             await checkForUsageLimit(org);
             checkForMarkedForDeletion(org);
diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index e10aa76c93..184a0ab878 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -7,7 +7,6 @@
     import { GRACE_PERIOD_OVERRIDE, isCloud } from '$lib/system';
     import { page } from '$app/state';
     import { registerCommands } from '$lib/commandCenter';
-    import { formatName as formatNameHelper } from '$lib/helpers/string';
     import {
         CardContainer,
         Empty,
@@ -23,8 +22,7 @@
     import { onMount, type ComponentType } from 'svelte';
     import { canWriteProjects } from '$lib/stores/roles';
     import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
-    import { Alert, Badge, Icon, Layout, Tag, Tooltip, Typography } from '@appwrite.io/pink-svelte';
-    import { isSmallViewport } from '$lib/stores/viewport';
+    import { Alert, Badge, Icon, Layout, Tooltip, Typography } from '@appwrite.io/pink-svelte';
     import {
         IconAndroid,
         IconApple,
@@ -38,14 +36,11 @@
     import { getPlatformInfo } from '$lib/helpers/platform';
     import CreateProjectCloud from './createProjectCloud.svelte';
     import { regions as regionsStore } from '$lib/stores/organization';
-    import SelectProjectCloud from '$lib/components/billing/alerts/selectProjectCloud.svelte';
-    import ArchiveProject from '$lib/components/archiveProject.svelte';
 
     let { data }: PageProps = $props();
 
     let showCreate = $state(false);
     let addOrganization = $state(false);
-    let showSelectProject = $state(false);
     let showCreateProjectCloud = $state(false);
     let freePlanAlertDismissed = $state(false);
 
@@ -123,24 +118,7 @@
         return $regionsStore.regions.find((region) => region.$id === project.region);
     }
 
-    function isSetToArchive(project: Models.Project): boolean {
-        if (!isCloud) return false;
-        if (!project || !project.$id) return false;
-        return project.status === 'archived';
-    }
-
-    const projectsToArchive = $derived(
-        (data.archivedProjectsPage ?? data.projects.projects).filter(
-            (project) => project.status === 'archived'
-        )
-    );
-
-    const activeTotalOverall = $derived(
-        data?.activeTotalOverall ??
-            data?.organization?.projects?.length ??
-            data?.projects?.total ??
-            0
-    );
+    const activeProjectsTotal = $derived(data?.projects.total);
 
     function clearSearch() {
         searchQuery?.clearInput();
@@ -162,11 +140,6 @@
     });
 </script>
 
-<SelectProjectCloud
-    bind:showSelectProject
-    organizationId={page.params.organization}
-    selectedProjects={data.organization.projects || []} />
-
 <Container>
     <Layout.Stack direction="row" justifyContent="space-between" class="common-section">
         <SearchQuery bind:this={searchQuery} placeholder="Search by name, label, or ID" />
@@ -196,30 +169,7 @@
         {/if}
     </Layout.Stack>
 
-    {#if isCloud && data.currentPlan?.projects && data.currentPlan?.projects > 0 && data.organization.projects.length > 0 && $canWriteProjects && (projectsToArchive.length > 0 || data.projects.total > data.currentPlan.projects)}
-        {@const difference = projectsToArchive.length}
-        {@const messagePrefix =
-            difference !== 1 ? `${difference} projects are` : `${difference} project is`}
-        <Alert.Inline title={`${messagePrefix} archived`}>
-            <Typography.Text>Upgrade your plan to restore archived projects</Typography.Text>
-            <svelte:fragment slot="actions">
-                <Button
-                    compact
-                    size="s"
-                    href={getChangePlanUrl(data.organization.$id)}
-                    on:click={() => {
-                        trackEvent(Click.OrganizationClickUpgrade, {
-                            from: 'button',
-                            source: 'projects_archive_alert'
-                        });
-                    }}>
-                    Upgrade to Pro
-                </Button>
-            </svelte:fragment>
-        </Alert.Inline>
-    {/if}
-
-    {#if isCloud && !data.program && data.currentPlan?.projects !== 0 && projectsToArchive.length === 0 && !freePlanAlertDismissed}
+    {#if isCloud && !data.program && data.currentPlan?.projects && activeProjectsTotal <= data.currentPlan.projects && !freePlanAlertDismissed}
         <Alert.Inline dismissible on:dismiss={dismissFreePlanAlert}>
             <Typography.Text
                 >Your Free plan includes up to {data.currentPlan?.projects} projects and limited resources.
@@ -244,43 +194,20 @@
     {#if data.projects.total > 0}
         <CardContainer
             disableEmpty={!$canWriteProjects}
-            total={activeTotalOverall}
+            total={activeProjectsTotal}
             offset={data.offset}
             on:click={handleCreateProject}>
             {#each data.projects.projects as project}
                 {@const platforms = filterPlatforms(
                     project.platforms.map((platform) => getPlatformInfo(platform.type))
                 )}
-                {@const formatted = isSetToArchive(project)
-                    ? formatNameHelper(project.name, isSmallViewport ? 19 : 25)
-                    : project.name}
                 <GridItem1
                     href={`${base}/project-${project.region}-${project.$id}/overview/platforms`}>
                     <svelte:fragment slot="eyebrow">
                         {project?.platforms?.length ? project?.platforms?.length : 'No'} apps
                     </svelte:fragment>
                     <svelte:fragment slot="title">
-                        <Tooltip
-                            maxWidth={project.name.length.toString()}
-                            placement="top"
-                            disabled={!isSetToArchive(project)}>
-                            {formatted}
-                            <span slot="tooltip">
-                                {project.name}
-                            </span>
-                        </Tooltip>
-                    </svelte:fragment>
-
-                    <svelte:fragment slot="status">
-                        {#if isSetToArchive(project)}
-                            <Tag
-                                size="s"
-                                style="white-space: nowrap;"
-                                on:click={(event) => {
-                                    event.preventDefault();
-                                    showSelectProject = true;
-                                }}>Set to archive</Tag>
-                        {/if}
+                        {project.name}
                     </svelte:fragment>
 
                     {#each platforms.slice(0, 2) as platform}
@@ -329,16 +256,7 @@
         name="Projects"
         limit={data.limit}
         offset={data.offset}
-        total={activeTotalOverall} />
-
-    <!-- Archived Projects Section -->
-    <ArchiveProject
-        {projectsToArchive}
-        organization={data.organization}
-        currentPlan={data.currentPlan}
-        archivedTotalOverall={data.archivedTotalOverall}
-        archivedOffset={data.archivedOffset}
-        limit={data.limit} />
+        total={activeProjectsTotal} />
 </Container>
 <CreateOrganization bind:show={addOrganization} />
 <CreateProject bind:show={showCreate} teamId={page.params.organization} />
diff --git a/src/routes/(console)/organization-[organization]/+page.ts b/src/routes/(console)/organization-[organization]/+page.ts
index fc4256b032..9a6c850238 100644
--- a/src/routes/(console)/organization-[organization]/+page.ts
+++ b/src/routes/(console)/organization-[organization]/+page.ts
@@ -5,12 +5,17 @@ import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load';
 import { CARD_LIMIT, Dependencies } from '$lib/constants';
 import type { PageLoad } from './$types';
 import { redirect } from '@sveltejs/kit';
-import { base } from '$app/paths';
+import { resolve } from '$app/paths';
 
 export const load: PageLoad = async ({ params, url, route, depends, parent }) => {
     const { scopes } = await parent();
     if (!scopes.includes('projects.read') && scopes.includes('billing.read')) {
-        return redirect(301, `${base}/organization-${params.organization}/billing`);
+        return redirect(
+            301,
+            resolve('/(console)/organization-[organization]/billing', {
+                organization: params.organization
+            })
+        );
     }
 
     depends(Dependencies.ORGANIZATION);
@@ -20,76 +25,33 @@ export const load: PageLoad = async ({ params, url, route, depends, parent }) =>
     const offset = pageToOffset(page, limit);
     const search = getSearch(url);
 
-    const archivedPageRaw = parseInt(url.searchParams.get('archivedPage') || '1', 10);
-    const archivedPage =
-        Number.isFinite(archivedPageRaw) && archivedPageRaw > 0 ? archivedPageRaw : 1;
-    const archivedOffset = pageToOffset(archivedPage, limit);
-
     const searchQueries = search
         ? [Query.or([Query.search('search', search), Query.contains('labels', search)])]
         : [];
-    const commonQueries = [Query.equal('teamId', params.organization)];
     const activeQueries = isCloud
         ? [Query.or([Query.equal('status', 'active'), Query.isNull('status')])]
         : [];
 
-    const [activeProjects, archivedProjects, activeTotal, archivedTotal] = await Promise.all([
-        sdk.forConsole.projects.list({
-            queries: [
-                Query.offset(offset),
-                Query.limit(limit),
-                Query.orderDesc(''),
-                ...commonQueries,
-                ...searchQueries,
-                ...activeQueries
-            ]
-        }),
-        isCloud
-            ? sdk.forConsole.projects.list({
-                  queries: [
-                      Query.offset(archivedOffset),
-                      Query.limit(limit),
-                      Query.orderDesc(''),
-                      ...commonQueries,
-                      ...searchQueries,
-                      Query.equal('status', 'archived')
-                  ]
-              })
-            : Promise.resolve({ projects: [], total: 0 }),
-        sdk.forConsole.projects.list({
-            queries: [...commonQueries, ...activeQueries, ...searchQueries]
-        }),
-        isCloud
-            ? sdk.forConsole.projects.list({
-                  queries: [...commonQueries, ...searchQueries, Query.equal('status', 'archived')]
-              })
-            : Promise.resolve({ projects: [], total: 0 })
-    ]);
+    const activeProjects = await sdk.forConsole.projects.list({
+        queries: [
+            ...searchQueries,
+            ...activeQueries,
+            Query.offset(offset),
+            Query.limit(limit),
+            Query.orderDesc(''),
+            Query.equal('teamId', params.organization)
+        ]
+    });
 
     // set `default` if no region!
     for (const project of activeProjects.projects) {
         project.region ??= 'default';
     }
-    if (isCloud) {
-        for (const project of archivedProjects.projects) {
-            project.region ??= 'default';
-        }
-    }
 
     return {
-        offset,
         limit,
-        projects: {
-            ...activeProjects,
-            projects: activeProjects.projects,
-            total: activeTotal.total
-        },
-        activeProjectsPage: activeProjects.projects,
-        archivedProjectsPage: archivedProjects.projects,
-        activeTotalOverall: activeTotal.total,
-        archivedTotalOverall: archivedTotal.total,
-        archivedOffset,
-        archivedPage,
-        search
+        offset,
+        search,
+        projects: activeProjects
     };
 };
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index 850f9fb11b..80d585adfa 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -46,9 +46,6 @@
     let previousPage: string = resolve('/');
     let showExitModal = false;
     let formComponent: Form;
-    let usageLimitsComponent:
-        | { validateOrAlert: () => boolean; getSelectedProjects: () => string[] }
-        | undefined;
     let isSubmitting = writable(false);
     let collaborators: string[] =
         data?.members?.memberships
@@ -62,7 +59,7 @@
     let feedbackDowngradeReason: string;
     let feedbackMessage: string;
     let orgUsage: Models.UsageOrganization;
-    let allProjects: { projects: Models.Project[] } | undefined;
+    let allProjects: { projects: Models.Project[] } = { projects: [] };
 
     $: paymentMethods = null;
 
@@ -132,18 +129,15 @@
         return paymentMethods;
     }
 
+    function hasExcessProjectsForFreePlan(): boolean {
+        const freeBasePlan = getBasePlanFromGroup(BillingPlanGroup.Starter);
+        const freePlanProjectLimit = freeBasePlan?.projects ?? 2;
+        const currentProjectCount = allProjects.projects.length;
+        return currentProjectCount > freePlanProjectLimit;
+    }
+
     async function handleSubmit() {
         if (isDowngrade) {
-            // If target plan has a non-zero project limit, ensure selection made
-            const targetProjectsLimit = selectedPlan?.projects ?? 0;
-            const shouldShowProjectSelector =
-                targetProjectsLimit > 0 && allProjects.projects.length > targetProjectsLimit;
-
-            if (shouldShowProjectSelector && usageLimitsComponent?.validateOrAlert) {
-                const ok = usageLimitsComponent.validateOrAlert();
-                if (!ok) return;
-            }
-
             await downgrade();
         } else if (isUpgrade) {
             await upgrade();
@@ -169,6 +163,18 @@
     }
 
     async function downgrade() {
+        if (selectedPlan.group === BillingPlanGroup.Starter && hasExcessProjectsForFreePlan()) {
+            const freeBasePlan = getBasePlanFromGroup(BillingPlanGroup.Starter);
+            const freePlanProjectLimit = freeBasePlan?.projects ?? 2;
+            const currentProjectCount = allProjects?.projects?.length ?? 0;
+
+            addNotification({
+                type: 'error',
+                message: `Please delete ${currentProjectCount - freePlanProjectLimit} project${currentProjectCount - freePlanProjectLimit !== 1 ? 's' : ''} before downgrading`
+            });
+            return;
+        }
+
         try {
             // 1) update the plan first
             await sdk.forConsole.organizations.updatePlan({
@@ -177,22 +183,6 @@
                 paymentMethodId
             });
 
-            // 2) If the target plan has a project limit, apply selected projects now
-            const targetProjectsLimit = selectedPlan?.projects ?? 0;
-            if (targetProjectsLimit > 0 && usageLimitsComponent) {
-                const selected = usageLimitsComponent.getSelectedProjects();
-                if (selected?.length) {
-                    try {
-                        await sdk.forConsole.organizations.updateProjects({
-                            organizationId: data.organization.$id,
-                            projects: selected
-                        });
-                    } catch (projectError) {
-                        console.warn('Project selection failed after plan update:', projectError);
-                    }
-                }
-            }
-
             await Promise.all([trackDowngradeFeedback(), invalidate(Dependencies.ORGANIZATION)]);
 
             await goto(previousPage);
@@ -319,9 +309,19 @@
 
     $: isUpgrade = selectedPlan.order > $currentPlan?.order;
     $: isDowngrade = selectedPlan.order < $currentPlan?.order;
-    $: isButtonDisabled =
-        $organization?.billingPlanId === selectedPlan.$id ||
-        (isDowngrade && selectedPlan.group === BillingPlanGroup.Starter && data.hasFreeOrgs);
+
+    // Check if projects exceed Free plan limit when downgrading
+    $: isButtonDisabled = (() => {
+        const freeBasePlan = getBasePlanFromGroup(BillingPlanGroup.Starter);
+        const freePlanProjectLimit = freeBasePlan?.projects ?? 2;
+        const hasExcessProjects = allProjects.projects.length > freePlanProjectLimit;
+
+        if ($organization?.billingPlanId === selectedPlan.$id) return true;
+        if (isDowngrade && selectedPlan.group === BillingPlanGroup.Starter && data.hasFreeOrgs)
+            return true;
+
+        return isDowngrade && selectedPlan.group === BillingPlanGroup.Starter && hasExcessProjects;
+    })();
 </script>
 
 <svelte:head>
@@ -401,9 +401,8 @@
                         {/if}
 
                         <OrganizationUsageLimits
-                            bind:this={usageLimitsComponent}
                             organization={data.organization}
-                            projects={allProjects?.projects || []}
+                            bind:projects={allProjects.projects}
                             members={data.members?.memberships || []}
                             storageUsage={orgUsage?.storageTotal ?? 0} />
                     {/if}
diff --git a/src/routes/(console)/project-[region]-[project]/+layout.ts b/src/routes/(console)/project-[region]-[project]/+layout.ts
index 26683eddaa..01700f3795 100644
--- a/src/routes/(console)/project-[region]-[project]/+layout.ts
+++ b/src/routes/(console)/project-[region]-[project]/+layout.ts
@@ -18,6 +18,16 @@ export const load: LayoutLoad = async ({ params, depends, parent }) => {
     depends(Dependencies.PROJECT);
 
     const project = await sdk.forConsole.projects.get({ projectId: params.project });
+    if (project.status !== 'active') {
+        // project isn't active, redirect back to organizations page
+        redirect(
+            303,
+            resolve('/(console)/organization-[organization]', {
+                organization: project.teamId
+            })
+        );
+    }
+
     project.region ??= 'default';
 
     // fast path without a network call!