diff --git a/package.json b/package.json
index d3de6cd0a..da8edb46c 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,6 @@
     "ini": "1.3.5",
     "jimp": "0.9.3",
     "mime-types": "2.1.26",
-    "moment": "2.24.0",
     "multer": "1.4.2",
     "node-abi": "2.13.0",
     "open": "7.0.0",
diff --git a/src/public/javascripts/services/app_context.js b/src/public/javascripts/services/app_context.js
index bcc849dfb..f2ab435f0 100644
--- a/src/public/javascripts/services/app_context.js
+++ b/src/public/javascripts/services/app_context.js
@@ -138,15 +138,11 @@ class AppContext {
         }
     }
 
-    activateNote(notePath) {
-        const activeTabContext = this.getActiveTabContext();
-
-        console.log("Setting activeTabContext to " + notePath);
-
-        activeTabContext.setNote(notePath);
-
-        this._setTitleBar();
-        this._setCurrentNotePathToHash();
+    tabNoteSwitchedListener({tabId}) {
+        if (tabId === this.activeTabId) {
+            this._setTitleBar();
+            this._setCurrentNotePathToHash();
+        }
     }
 
     _setCurrentNotePathToHash() {
diff --git a/src/public/javascripts/widgets/note_detail.js b/src/public/javascripts/widgets/note_detail.js
index cbbeac435..0b73632e4 100644
--- a/src/public/javascripts/widgets/note_detail.js
+++ b/src/public/javascripts/widgets/note_detail.js
@@ -95,17 +95,17 @@ export default class NoteDetailWidget extends TabAwareWidget {
     }
 
     async initType() {
-        do {
-            this.type = this.getWidgetType();
+        let foundType;
 
-            console.log(`Note detail type = ${this.type} for ${this.tabContext.tabId}`);
+        do {
+            foundType = this.type = this.getWidgetType();
 
             if (!(this.type in this.typeWidgetPromises)) {
                 this.typeWidgetPromises[this.type] = this.initWidgetType(this.type);
             }
 
             await this.typeWidgetPromises[this.type];
-        } while (this.type !== this.getWidgetType());
+        } while (foundType !== this.getWidgetType());
     }
 
     setupClasses() {
@@ -216,10 +216,4 @@ export default class NoteDetailWidget extends TabAwareWidget {
     protectedSessionStartedListener() {
         this.refresh();
     }
-
-    async eventReceived(name, data, sync = false) {
-        console.log("Received ", name, data);
-
-        super.eventReceived(name, data, sync);
-    }
 }
\ No newline at end of file
diff --git a/src/public/javascripts/widgets/note_tree.js b/src/public/javascripts/widgets/note_tree.js
index 9bec4b87b..e7a2ba8a8 100644
--- a/src/public/javascripts/widgets/note_tree.js
+++ b/src/public/javascripts/widgets/note_tree.js
@@ -107,7 +107,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
 
                 const notePath = await treeUtils.getNotePath(data.node);
 
-                this.appContext.activateNote(notePath);
+                const activeTabContext = this.appContext.getActiveTabContext();
+                await activeTabContext.setNote(notePath);
             },
             expand: (event, data) => this.setExpandedToServer(data.node.data.branchId, true),
             collapse: (event, data) => this.setExpandedToServer(data.node.data.branchId, false),
diff --git a/src/public/javascripts/widgets/type_widgets/empty.js b/src/public/javascripts/widgets/type_widgets/empty.js
index 400da076d..cb3fe6229 100644
--- a/src/public/javascripts/widgets/type_widgets/empty.js
+++ b/src/public/javascripts/widgets/type_widgets/empty.js
@@ -36,12 +36,6 @@ export default class EmptyTypeWidget extends TypeWidget {
         return this.$widget;
     }
 
-    toggle(show) {
-        console.log("EMPTY TOGGLE", show);
-
-        super.toggle(show);
-    }
-
     refresh() {
         this.toggle(!this.tabContext.note);
     }