diff --git a/packages/client/src/components/preview/GridDNDHandler.svelte b/packages/client/src/components/preview/GridDNDHandler.svelte
index 4f810d226f..6ada5b4b4b 100644
--- a/packages/client/src/components/preview/GridDNDHandler.svelte
+++ b/packages/client/src/components/preview/GridDNDHandler.svelte
@@ -124,7 +124,6 @@
   }
 
   const startDraggingPlaceholder = () => {
-    console.log("START PLACEHOLDER")
     const mode = GridDragModes.Move
     const id = DNDPlaceholderID
 
@@ -160,7 +159,6 @@
     }
 
     // Add event handler to clear all drag state when dragging ends
-    console.log("add up listener")
     document.addEventListener("mouseup", stopDragging)
   }
 
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 7d6b100dc6..20f582106b 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -36,8 +36,6 @@ import * as internal from "svelte/internal"
 window.svelte_internal = internal
 window.svelte = svelte
 
-console.log("NEW CLIENT")
-
 // Initialise spectrum icons
 // eslint-disable-next-line local-rules/no-budibase-imports
 import loadSpectrumIcons from "@budibase/bbui/spectrum-icons-vite.js"
diff --git a/packages/client/src/stores/dnd.js b/packages/client/src/stores/dnd.js
index 16f1441950..38c1e8aab8 100644
--- a/packages/client/src/stores/dnd.js
+++ b/packages/client/src/stores/dnd.js
@@ -1,6 +1,6 @@
 import { writable, get } from "svelte/store"
 import { derivedMemo } from "@budibase/frontend-core"
-import { screenStore } from "@/stores"
+import { screenStore, isGridScreen } from "@/stores"
 import { ScreenslotID } from "@/constants"
 
 const createDndStore = () => {
@@ -33,15 +33,11 @@ const createDndStore = () => {
       return
     }
 
+    // On grid screens, we already know exactly where to insert the component
     let target, drop
     const screen = get(screenStore)?.activeScreen
-    const isGridScreen = screen?.props?.layout === "grid"
-    if (isGridScreen) {
+    if (get(isGridScreen)) {
       const id = screen?.props?._id
-      drop = {
-        parent: id,
-        index: screen?.props?._children?.length,
-      }
       target = {
         id,
         parent: ScreenslotID,
@@ -49,6 +45,10 @@ const createDndStore = () => {
         empty: false,
         acceptsChildren: true,
       }
+      drop = {
+        parent: id,
+        index: screen?.props?._children?.length,
+      }
     }
 
     // Get size of new component so we can show a properly sized placeholder
@@ -57,7 +57,6 @@ const createDndStore = () => {
 
     store.set({
       ...initialState,
-      isGridScreen,
       source: {
         id: null,
         parent: null,
@@ -73,7 +72,6 @@ const createDndStore = () => {
   const updateTarget = ({ id, parent, node, empty, acceptsChildren }) => {
     store.update(state => {
       state.target = { id, parent, node, empty, acceptsChildren }
-      console.log("TARGET", state.target)
       return state
     })
   }
@@ -81,7 +79,6 @@ const createDndStore = () => {
   const updateDrop = ({ parent, index }) => {
     store.update(state => {
       state.drop = { parent, index }
-      console.log("DROP", state.drop)
       return state
     })
   }
@@ -127,7 +124,3 @@ export const dndIsNewComponent = derivedMemo(
   dndStore,
   x => x.source?.newComponentType != null
 )
-export const dndNewComponentProps = derivedMemo(
-  dndStore,
-  x => x.meta?.newComponentProps
-)
diff --git a/packages/client/src/stores/index.js b/packages/client/src/stores/index.js
index 7d8257f6d0..268b0cc4bf 100644
--- a/packages/client/src/stores/index.js
+++ b/packages/client/src/stores/index.js
@@ -25,7 +25,6 @@ export {
   dndBounds,
   dndIsNewComponent,
   dndIsDragging,
-  dndNewComponentProps,
 } from "./dnd"
 export { sidePanelStore } from "./sidePanel"
 export { modalStore } from "./modal"