diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index 254929152..c59e39f9d 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -7,7 +7,6 @@
     import { calculateTime } from '$lib/helpers/timeConversion';
     import {
         TableBody,
-        TableCell,
         TableCellHead,
         TableCellText,
         TableHeader,
diff --git a/src/lib/stores/wizard.ts b/src/lib/stores/wizard.ts
index d589112cf..0bb71a565 100644
--- a/src/lib/stores/wizard.ts
+++ b/src/lib/stores/wizard.ts
@@ -1,4 +1,5 @@
 import { trackEvent } from '$lib/actions/analytics';
+import type { SvelteComponent } from 'svelte';
 import { writable } from 'svelte/store';
 
 export type WizardStore = {
diff --git a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
index a7c7ccb53..0bf8acb7d 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/+page.svelte
@@ -25,7 +25,6 @@
     import { base } from '$app/paths';
     import { app } from '$lib/stores/app';
     import { calculateSize, humanFileSize } from '$lib/helpers/sizeConvertion';
-    import { timeFromNow } from '$lib/helpers/date';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { Query, type Models } from '@appwrite.io/console';
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
index d40298258..37d464b2a 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -3,7 +3,6 @@
     import { Card, CardGrid, Id } from '$lib/components';
     import { Pill } from '$lib/elements';
     import { Button } from '$lib/elements/forms';
-    import { timeFromNow } from '$lib/helpers/date';
     import { humanFileSize } from '$lib/helpers/sizeConvertion';
     import { calculateTime } from '$lib/helpers/timeConversion';
     import { Container } from '$lib/layout';
@@ -16,13 +15,11 @@
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import { timer } from '$lib/actions/timer';
-    import { tooltip } from '$lib/actions/tooltip';
     import DeploymentSource from '../deploymentSource.svelte';
 
     export let data;
 
     let logs = '';
-    let tooltipContent: HTMLDivElement;
 
     onMount(() => {
         logs = data.deployment.buildLogs;
@@ -124,9 +121,3 @@
         </div>
     </Card>
 </Container>
-
-<div class="u-hide">
-    <div bind:this={tooltipContent}>
-        <p class="text">test</p>
-    </div>
-</div>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deploymentCreatedBy.svelte b/src/routes/console/project-[project]/functions/function-[function]/deploymentCreatedBy.svelte
index cdc93d96b..4172a831c 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deploymentCreatedBy.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deploymentCreatedBy.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
     import { timeFromNow } from '$lib/helpers/date';
-    import { tooltip } from '$lib/actions/tooltip';
     import type { Models } from '@appwrite.io/console';
 
     export let deployment: Models.Deployment;
diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte
index d68cc9684..d8880999d 100644
--- a/src/routes/console/project-[project]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/settings/+page.svelte
@@ -12,30 +12,16 @@
     import UpdateInstallations from './updateInstallations.svelte';
     import UpdateVariables from '../updateVariables.svelte';
     import DeleteProject from './deleteProject.svelte';
-    import { services, type Service } from '$lib/stores/project-services';
-    import { CardGrid, CopyInput, Box, Heading } from '$lib/components';
-    import { toLocaleDateTime } from '$lib/helpers/date';
-    import {
-        Button,
-        Form,
-        FormList,
-        InputText,
-        InputSwitch,
-        InputSelect
-    } from '$lib/elements/forms';
-    import { base } from '$app/paths';
-    import { page } from '$app/stores';
-    import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
+    import { CardGrid, Heading } from '$lib/components';
+    import { Button, FormList, InputSelect } from '$lib/elements/forms';
+    import { Submit, trackEvent } from '$lib/actions/analytics';
     import Transfer from './transferProject.svelte';
 
     export let data;
 
     let name: string = null;
     let teamId: string = null;
-    let showDelete = false;
     let showTransfer = false;
-    const endpoint = sdk.forConsole.client.config.endpoint;
-    const projectId = $page.params.project;
 
     onMount(() => {
         name ??= $project.name;
@@ -100,7 +86,6 @@
             {sdkDeleteVariable}
             isGlobal={true}
             variableList={data.variables} />
-        <DeleteProject />
 
         <CardGrid>
             <Heading tag="h6" size="7">Transfer project</Heading>
@@ -126,27 +111,8 @@
                     on:click={() => (showTransfer = true)}>Transfer</Button>
             </svelte:fragment>
         </CardGrid>
-        <CardGrid danger>
-            <div>
-                <Heading tag="h6" size="7">Delete Project</Heading>
-            </div>
-            <p>
-                The project will be permanently deleted, including all the metadata, resources and
-                stats within it. This action is irreversible.
-            </p>
-            <svelte:fragment slot="aside">
-                <Box>
-                    <svelte:fragment slot="title">
-                        <h6 class="u-bold u-trim-1">{$project.name}</h6>
-                    </svelte:fragment>
-                    <p>Last update: {toLocaleDateTime($project.$updatedAt)}</p>
-                </Box>
-            </svelte:fragment>
 
-            <svelte:fragment slot="actions">
-                <Button secondary on:click={() => (showDelete = true)}>Delete</Button>
-            </svelte:fragment>
-        </CardGrid>
+        <DeleteProject />
     {/if}
 </Container>
 
diff --git a/src/routes/console/project-[project]/settings/deleteProject.svelte b/src/routes/console/project-[project]/settings/deleteProject.svelte
index 8414d4695..53f24e675 100644
--- a/src/routes/console/project-[project]/settings/deleteProject.svelte
+++ b/src/routes/console/project-[project]/settings/deleteProject.svelte
@@ -3,14 +3,13 @@
     import { base } from '$app/paths';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { Box, CardGrid, Heading, Modal } from '$lib/components';
-    import { Button, FormList, InputPassword, InputText } from '$lib/elements/forms';
+    import { Button, FormList, InputText } from '$lib/elements/forms';
     import { toLocaleDateTime } from '$lib/helpers/date';
     import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { project } from '../store';
 
     let showDelete = false;
-    let password: string = null;
     let name: string = null;
 
     const handleDelete = async () => {
@@ -75,18 +74,9 @@
             autofocus
             required
             bind:value={name} />
-        <InputPassword
-            label="To verify, enter your password"
-            placeholder="Enter password"
-            id="password"
-            required
-            showPasswordButton={true}
-            bind:value={password} />
     </FormList>
     <svelte:fragment slot="footer">
         <Button text on:click={() => (showDelete = false)}>Cancel</Button>
-        <Button disabled={!name || !password || name !== $project.name} secondary submit>
-            Delete
-        </Button>
+        <Button disabled={!name || name !== $project.name} secondary submit>Delete</Button>
     </svelte:fragment>
 </Modal>
diff --git a/src/routes/console/project-[project]/settings/updateServices.svelte b/src/routes/console/project-[project]/settings/updateServices.svelte
index e2888b77f..f18bb2a27 100644
--- a/src/routes/console/project-[project]/settings/updateServices.svelte
+++ b/src/routes/console/project-[project]/settings/updateServices.svelte
@@ -10,6 +10,7 @@
     import { project } from '../store';
     import EnableAllServices from './enableAllServices.svelte';
     import DisableAllServices from './disableAllServices.svelte';
+    import Button from '$lib/elements/forms/button.svelte';
 
     let showDisableAll = false;
     let showEnableAll = false;