diff --git a/src/lib/app_components/e_app_help_tech.svelte b/src/lib/app_components/e_app_help_tech.svelte
index 80520866..994b7cbc 100644
--- a/src/lib/app_components/e_app_help_tech.svelte
+++ b/src/lib/app_components/e_app_help_tech.svelte
@@ -54,6 +54,7 @@ import {
     type key_val
 } from '$lib/stores/ae_stores';
 import { api } from '$lib/ae_api/api';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 
 if (log_lvl) {
     console.log(`Help - technical support component loaded`);
@@ -514,23 +515,7 @@ class:to-90%={$ae_sess.show_help_tech} -->
                             return;
                         }
 
-                        if ('serviceWorker' in navigator) {
-                            const registrations = await navigator.serviceWorker.getRegistrations();
-                            for (const reg of registrations) await reg.unregister();
-                        }
-                        const cache_keys = await caches.keys();
-                        for (const key of cache_keys) await caches.delete(key);
-
-                        // Enumerate every IDB database on this origin and delete them all.
-                        const db_list = await indexedDB.databases();
-                        console.log('[clear_all] IDB databases found:', db_list.map((d) => d.name));
-                        for (const db of db_list) {
-                            if (db.name) indexedDB.deleteDatabase(db.name);
-                        }
-
-                        localStorage.clear();
-                        sessionStorage.clear();
-
+                        await core_func.clear_all_storage();
                         window.location.reload();
                     }}
                     class="
@@ -541,7 +526,7 @@ class:to-90%={$ae_sess.show_help_tech} -->
                         transition-all
                         {btn_class}
                         "
-                    title="Full Reset: Enumerate and delete ALL IndexedDB databases for this origin, clear localStorage and sessionStorage, then reload.">
+                    title="Full Reset: Unregister service workers, clear SW Cache Storage, delete all IndexedDB databases, clear localStorage and sessionStorage, then reload.">
                     <Trash2 size="1em" class="inline-block" />
                     <span class="md:inline">Full Reset</span>
                 </button>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 5cd42fe6..d3710629 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -29,6 +29,7 @@ import {
     slct,
     slct_trigger
 } from '$lib/stores/ae_stores';
+import { core_func } from '$lib/ae_core/ae_core_functions';
 interface Props {
     /** @type {import('./$types').PageData} */
     data: any;
@@ -139,22 +140,7 @@ onMount(() => {
 
                     // Unregister service workers and clear Cache Storage so stale
                     // SW-cached assets don't survive the reset and re-serve old bundles.
-                    if ('serviceWorker' in navigator) {
-                        const registrations = await navigator.serviceWorker.getRegistrations();
-                        for (const reg of registrations) await reg.unregister();
-                    }
-                    const cache_keys = await caches.keys();
-                    for (const key of cache_keys) await caches.delete(key);
-
-                    const db_list = await indexedDB.databases();
-                    console.log('[clear_all] IDB databases found:', db_list.map((d) => d.name));
-                    for (const db of db_list) {
-                        if (db.name) indexedDB.deleteDatabase(db.name);
-                    }
-
-                    localStorage.clear();
-                    sessionStorage.clear();
-
+                    await core_func.clear_all_storage();
                     window.location.reload();
                 }}
                 class="btn btn-sm