diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index 59505de4e3..589e0af799 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { isActive, goto, redirect } from "@roxi/routify"
+  import { isActive, redirect } from "@roxi/routify"
   import { auth } from "stores/backend"
   import { admin } from "stores/portal"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 53d6e17130..7fa584efd7 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -1,19 +1,7 @@
 <script>
   import { store, automationStore } from "builderStore"
   import { roles } from "stores/backend"
-  import {
-    Button,
-    Icon,
-    Modal,
-    ModalContent,
-    ActionGroup,
-    ActionButton,
-    Tabs,
-    Tab,
-  } from "@budibase/bbui"
-  import SettingsLink from "components/settings/Link.svelte"
-  import ThemeEditorDropdown from "components/settings/ThemeEditorDropdown.svelte"
-  import FeedbackNavLink from "components/feedback/FeedbackNavLink.svelte"
+  import { Button, Icon, ActionGroup, Tabs, Tab } from "@budibase/bbui"
   import DeployModal from "components/deploy/DeployModal.svelte"
   import RevertModal from "components/deploy/RevertModal.svelte"
   import { get } from "builderStore/api"
diff --git a/packages/builder/src/pages/builder/app/_layout.svelte b/packages/builder/src/pages/builder/app/_layout.svelte
new file mode 100644
index 0000000000..ece538e0e9
--- /dev/null
+++ b/packages/builder/src/pages/builder/app/_layout.svelte
@@ -0,0 +1,7 @@
+<script>
+  import { auth } from "stores/backend"
+</script>
+
+{#if $auth.user}
+  <slot />
+{/if}