diff --git a/frontend/apps/editor3d/app/src/components/signaled/TopBar/AuthButtons.tsx b/frontend/apps/editor3d/app/src/components/signaled/TopBar/AuthButtons.tsx
index b113497f1e..88de2dd4d0 100644
--- a/frontend/apps/editor3d/app/src/components/signaled/TopBar/AuthButtons.tsx
+++ b/frontend/apps/editor3d/app/src/components/signaled/TopBar/AuthButtons.tsx
@@ -1,7 +1,7 @@
 import { useSignals } from "@preact/signals-react/runtime";
 import { AUTH_STATUS } from "~/enums";
 import { authentication } from "~/signals";
-import { ButtonLink } from "@storyteller/ui-button-link";
+//import { ButtonLink } from "@storyteller/ui-button-link";
 import ProfileDropdown from "./ProfileDropdown";
 
 export const AuthButtons = () => {
@@ -16,7 +16,7 @@ export const AuthButtons = () => {
       <div className="flex items-center gap-3.5">
         <span className="text-white/20">|</span>
         <div className="flex items-center gap-2">
-          <ButtonLink
+         {/* <ButtonLink
             to="/login"
             variant="secondary"
             reloadDocument={true}
@@ -28,9 +28,9 @@ export const AuthButtons = () => {
             to="/signup"
             reloadDocument={true}
             className="h-[38px]" // TODO(bt,2025-04-19): Once we have in-page routing, get rid of this.
-          >
+          > 
             Sign Up
-          </ButtonLink>
+          </ButtonLink> */}
         </div>
       </div>
     );
diff --git a/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx b/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx
index 1930ac5415..fa812fc2c7 100644
--- a/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx
+++ b/frontend/apps/editor3d/app/src/components/signaled/TopBar/TopBar.tsx
@@ -10,7 +10,7 @@ import {
 } from "@fortawesome/pro-solid-svg-icons";
 import { useLocation, useParams } from "react-router-dom";
 import { Button } from "@storyteller/ui-button";
-import { ButtonLink } from "@storyteller/ui-button-link";
+// import { ButtonLink } from "@storyteller/ui-button-link";
 import { AuthButtons } from "./AuthButtons";
 import { SceneTitleInput } from "./SceneTitleInput";
 import { getCurrentLocationWithoutParams } from "~/utilities";
@@ -157,11 +157,11 @@ export const TopBar = ({
                 alt="Logo ArtCraft"
               />
             </a>
-            {!isEditorPath(currentLocation) && (
+            {/* {!isEditorPath(currentLocation) && (
               <ButtonLink to={"/"} variant="secondary" icon={faChevronLeft}>
                 Back to Editor
               </ButtonLink>
-            )}
+            )} */}
             <MenuIconSelector
               menuItems={appMenuTabs}
               activeMenu={appTabIdSignal.value}
diff --git a/frontend/apps/editor3d/app/src/pages/Page404/index.tsx b/frontend/apps/editor3d/app/src/pages/Page404/index.tsx
deleted file mode 100644
index bdd72fcd36..0000000000
--- a/frontend/apps/editor3d/app/src/pages/Page404/index.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { faChevronLeft } from "@fortawesome/pro-solid-svg-icons";
-import { P, H1 } from "~/components";
-import { json } from "react-router-dom";
-import { ButtonLink } from "@storyteller/ui-button-link";
-
-export const loader = () => {
-  return json(null, { status: 404 });
-};
-
-export const Page404 = () => {
-  return (
-    <div
-      className="fixed w-full overflow-scroll"
-      style={{ height: "calc(100% - 72px)" }}
-    >
-      <div className="mx-auto my-24 flex h-1/2 w-10/12 max-w-7xl flex-col items-center justify-center gap-8 rounded-lg bg-ui-panel p-6 text-center">
-        <P>Oops, seems like this is not a page that exists!</P>
-        <H1>Server Error: 404</H1>
-
-        <ButtonLink to="/" icon={faChevronLeft}>
-          Back to Dashboard
-        </ButtonLink>
-      </div>
-    </div>
-  );
-};
-export default Page404;
diff --git a/frontend/apps/editor3d/tsconfig.json b/frontend/apps/editor3d/tsconfig.json
index 9f6a10e94e..e364cb141b 100644
--- a/frontend/apps/editor3d/tsconfig.json
+++ b/frontend/apps/editor3d/tsconfig.json
@@ -100,9 +100,6 @@
     {
       "path": "../../libs/components/gravatar"
     },
-    {
-      "path": "../../libs/components/button-link"
-    },
     {
       "path": "../../libs/components/select"
     },
@@ -125,10 +122,10 @@
       "path": "../../libs/components/input"
     },
     {
-      "path": "../../libs/components/button"
+      "path": "../../libs/components/list-dropdown"
     },
     {
-      "path": "../../libs/components/list-dropdown"
+      "path": "../../libs/components/button"
     },
     {
       "path": "../../libs/tauri-utils"
diff --git a/frontend/libs/components/button-link/src/lib/button-link.spec.tsx b/frontend/libs/components/button-link/src/lib/button-link.spec.tsx
index 271618ff28..643408b367 100644
--- a/frontend/libs/components/button-link/src/lib/button-link.spec.tsx
+++ b/frontend/libs/components/button-link/src/lib/button-link.spec.tsx
@@ -1,12 +1,12 @@
 import { render } from '@testing-library/react';
 
-import ButtonLink from './button-link';
+// import ButtonLink from './button-link';
 
-describe('ButtonLink', () => {
+// describe('ButtonLink', () => {
   
-  it('should render successfully', () => {
-    const { baseElement } = render(<ButtonLink />);
-    expect(baseElement).toBeTruthy();
-  });
+//   it('should render successfully', () => {
+//     const { baseElement } = render(<ButtonLink />);
+//     expect(baseElement).toBeTruthy();
+//   });
   
-});
+// });