diff --git a/ui/src/GameSpace/Element/Element.svelte b/ui/src/GameSpace/Element/Element.svelte
index db08c82..f2c4473 100644
--- a/ui/src/GameSpace/Element/Element.svelte
+++ b/ui/src/GameSpace/Element/Element.svelte
@@ -158,36 +158,6 @@
   $: Element = elements[previewEl.type].Element as any;
 
   let highlighted = false;
-  // function handleMouseOver(ev: MouseEvent) {
-  //   if (!$permissions.canEditComponents) return;
-  //   if (!draggable) {
-  //     highlighted = false;
-  //     return;
-  //   }
-  //   let target: HTMLElement = ev.target as HTMLElement;
-  //   while (true) {
-  //     if (target === ev.currentTarget) {
-  //       highlighted = true;
-  //       break;
-  //     } else if (target.draggable) {
-  //       console.log('DRAGGABLE');
-  //       highlighted = false;
-  //       break;
-  //     } else if (target.tagName === 'BUTTON') {
-  //       highlighted = false;
-  //       break;
-  //     } else if (target.tagName === 'IFRAME') {
-  //       highlighted = false;
-  //       break;
-  //     } else {
-  //       target = target.parentElement as HTMLElement;
-  //     }
-  //   }
-  // }
-
-  // function handleMouseLeave() {
-  //   highlighted = false;
-  // }
 </script>
 
 <div
diff --git a/ui/src/GameSpace/Surface.svelte b/ui/src/GameSpace/Surface.svelte
index c74347b..a9d77b7 100644
--- a/ui/src/GameSpace/Surface.svelte
+++ b/ui/src/GameSpace/Surface.svelte
@@ -129,6 +129,7 @@
   };
 
   const handlePanningStart = (ev: MouseEvent) => {
+    if (isPanning) return;
     if (shouldHandlePanning(ev.target as HTMLElement)) {
       isPanning = true;
       const [panInitialX, panInitialY] = [panX, panY];
@@ -148,6 +149,7 @@
       }
 
       function handleMouseUp() {
+        console.log('Ending panning');
         isPanning = false;
         window.document.removeEventListener('mousemove', handleMouseMove);
         window.document.removeEventListener('mouseup', handleMouseUp);
@@ -338,12 +340,6 @@
         zoomLevel={zoom}
       />
     {/each}
-    <!-- {#each Object.entries(playersPositions) as [hash, player] (hash)}
-      <div
-        class="absolute -left-6 -top-6 h12 w12 bg-red-500 rounded-full"
-        style={`transform: scale(${player.zoom}) translate(${-player.panX}px, ${-player.panY}px);`}
-      ></div>
-    {/each} -->
   </div>
   {#if import.meta.env.MODE === 'development'}
     <div class="bg-black/50 text-white rounded-tl-md absolute right-0 bottom-0 p1">