diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 4da0da44f9..f13aa3dab6 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -126,7 +126,11 @@
   })
 
   onDestroy(() => {
-    store.actions.reset()
+    // Run async on a slight delay to let other cleanup logic run without
+    // being confused by the store wiping
+    setTimeout(() => {
+      store.actions.reset()
+    }, 10)
   })
 </script>
 
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
index 22c35f9b6d..b655eac697 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/UserRenderer.svelte
@@ -1,42 +1,9 @@
 <script>
-  import { Tooltip } from "@budibase/bbui"
   import { UserAvatar } from "@budibase/frontend-core"
 
   export let row
-
-  let showTooltip
 </script>
 
 {#if row?.user?.email}
-  <div
-    class="container"
-    on:mouseover={() => (showTooltip = true)}
-    on:focus={() => (showTooltip = true)}
-    on:mouseleave={() => (showTooltip = false)}
-  >
-    <UserAvatar user={row.user} />
-  </div>
-  {#if showTooltip}
-    <div class="tooltip">
-      <Tooltip textWrapping text={row.user.email} direction="bottom" />
-    </div>
-  {/if}
+  <UserAvatar user={row.user} />
 {/if}
-
-<style>
-  .container {
-    position: relative;
-  }
-  .tooltip {
-    z-index: 1;
-    position: absolute;
-    top: 75%;
-    left: 120%;
-    transform: translateX(-100%) translateY(-50%);
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-end;
-    width: 130px;
-    pointer-events: none;
-  }
-</style>
diff --git a/packages/server/src/websockets/websocket.ts b/packages/server/src/websockets/websocket.ts
index d9c105d77c..3bf9f27416 100644
--- a/packages/server/src/websockets/websocket.ts
+++ b/packages/server/src/websockets/websocket.ts
@@ -92,7 +92,6 @@ export class BaseSocket {
       this.io.on("connection", async socket => {
         // Add built in handler for heartbeats
         socket.on(SocketEvent.Heartbeat, async () => {
-          console.log(socket.data.email, "heartbeat received")
           await this.extendSessionTTL(socket.data.sessionId)
         })