diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 89eb08ef8..8aa86cbea 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -1993,7 +1993,7 @@ RED.editor = (function() {
                 }
                 stateId = sb.join("/");
             }
-            if (stateId && suffix) { stateId += "/" + suffix; };
+            if (stateId && suffix) { stateId += "/" + suffix; }
             return stateId;
         } catch (error) {
             return false;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
index 9a9b582d1..f47ec508b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
@@ -68,7 +68,7 @@
                         id: "node-dialog-cancel",
                         text: RED._("common.label.cancel"),
                         click: function() {
-                            if (onCancel) { onCancel() };
+                            if (onCancel) { onCancel(); }
                             RED.tray.close();
                         }
                     },
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
index 80a212a72..b3c4c3848 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
@@ -71,7 +71,7 @@
                         id: "node-dialog-cancel",
                         text: RED._("common.label.cancel"),
                         click: function() {
-                            if(onCancel) { onCancel() };
+                            if(onCancel) { onCancel(); }
                             RED.tray.close();
                         }
                     },
@@ -356,9 +356,6 @@
                     expressionEditor.destroy();
                     testDataEditor.destroy();
                     testResultEditor.destroy();
-                    delete expressionEditor;
-                    delete testDataEditor;
-                    delete testResultEditor;
                 },
                 show: function() {}
             }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
index 5ab25177f..2073c6050 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/js.js
@@ -38,7 +38,7 @@
                         id: "node-dialog-cancel",
                         text: RED._("common.label.cancel"),
                         click: function() {
-                            if (onCancel) { onCancel() };
+                            if (onCancel) { onCancel(); }
                             RED.tray.close();
                         }
                     },
@@ -97,7 +97,6 @@
                         options.onclose();
                     }
                     expressionEditor.destroy();
-                    delete expressionEditor;
                 },
                 show: function() {}
             }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
index 400e001a1..84d2bce93 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/json.js
@@ -465,7 +465,7 @@
                         id: "node-dialog-cancel",
                         text: RED._("common.label.cancel"),
                         click: function() {
-                            if (onCancel) { onCancel() };
+                            if (onCancel) { onCancel(); }
                             RED.tray.close();
                         }
                     },
@@ -488,7 +488,7 @@
                                 result = expressionEditor.getValue();
                             }
                             expressionEditor.saveView();
-                            if (onComplete) { onComplete(result,null,expressionEditor) };
+                            if (onComplete) { onComplete(result,null,expressionEditor) }
                             RED.tray.close();
                         }
                     }
@@ -609,7 +609,6 @@
                         options.onclose();
                     }
                     expressionEditor.destroy();
-                    delete expressionEditor;
                 },
                 show: function() {}
             }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
index 68f99d07b..eeb8519e6 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@@ -73,7 +73,7 @@
                         id: "node-dialog-cancel",
                         text: RED._("common.label.cancel"),
                         click: function() {
-                            if (onCancel) { onCancel() };
+                            if (onCancel) { onCancel(); }
                             RED.tray.close();
                         }
                     },
@@ -159,7 +159,6 @@
                         options.onclose();
                     }
                     expressionEditor.destroy();
-                    delete expressionEditor;
                 },
                 show: function() {}
             }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/description.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/description.js
index 35c4b16d0..2106ae53b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/description.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/description.js
@@ -57,7 +57,7 @@
         var nodeInfoEditor = RED.editor.createEditor({
             id: editorId,
             mode: 'ace/mode/markdown',
-            stateId: RED.editor.generateViewStateId("node", node, "nodeinfo",),
+            stateId: RED.editor.generateViewStateId("node", node, "nodeinfo"),
             value: node.info || ""
         });
         node.infoEditor = nodeInfoEditor;
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/text.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/text.js
index e64e5e902..ee6a3f11c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/text.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/text.js
@@ -38,7 +38,7 @@
                         id: "node-dialog-cancel",
                         text: RED._("common.label.cancel"),
                         click: function() {
-                            if(onCancel) { onCancel() };
+                            if(onCancel) { onCancel(); }
                             RED.tray.close();
                         }
                     },
@@ -78,7 +78,6 @@
                         options.onclose();
                     }
                     expressionEditor.destroy();
-                    delete expressionEditor;
                 },
                 show: function() {}
             }
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
index 6d15394bb..0ea6d6044 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tray.js
@@ -172,7 +172,7 @@
                     if(!options.hasOwnProperty("focusElement")) {
                         //focusElement is not inside options - default to focusing 1st
                         body.find(":focusable:first").trigger("focus");
-                    } else if(!options.focusElement === false) {
+                    } else if(options.focusElement !== false) {
                         //focusElement IS specified, focus that instead (if not false)
                         $(options.focusElement).trigger("focus");
                     }