diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
index 2eeb5347d6..10ec8ae47e 100644
--- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js
+++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js
@@ -1185,7 +1185,6 @@ export default {
             settings: [{ label: "Logo URL", key: "logoUrl", control: Input }],
           },
         },
-        // TODO: need to deal with this
         {
           name: "Login",
           _component: "@budibase/standard-components/login",
diff --git a/packages/builder/src/pages/[application]/design/layouts/[layout]/_layout.svelte b/packages/builder/src/pages/[application]/design/layouts/[layout]/_layout.svelte
index c30d709a05..369793fdb8 100644
--- a/packages/builder/src/pages/[application]/design/layouts/[layout]/_layout.svelte
+++ b/packages/builder/src/pages/[application]/design/layouts/[layout]/_layout.svelte
@@ -9,18 +9,15 @@
   const validLayout = $store.layouts.some(layout => layout._id === currentLayoutId)
 
   if (!validLayout) {
-    // Go to main layout if URL set to invalid screen
-    console.error("Invalid screen", $params.screen)
-    const firstScreenId = $store.layouts[0]?._id
+    const firstLayoutId = $store.layouts[0]?._id
     store.actions.layouts.select($params.layout)
-    $goto(`./${firstScreenId}`)
+    $goto(`./${firstLayoutId}`)
   } else {
     // Otherwise proceed to set layout
     store.actions.layouts.select($params.layout)
 
     // There are leftover stuff, like IDs, so navigate the components and find the ID and select it.
     if ($leftover) {
-      console.log("leftover", $params.layout)
       // Get the correct layout children.
       const layoutChildren = $store.layouts.find(
         layout =>