diff --git a/src/modules/template/editorWindow.ts b/src/modules/template/editorWindow.ts
index 67b04da..8a94af4 100644
--- a/src/modules/template/editorWindow.ts
+++ b/src/modules/template/editorWindow.ts
@@ -214,14 +214,7 @@ async function updatePreview() {
   const win = addon.data.templateEditor.window;
   const container = win?.document.getElementById("preview-container");
   if (container) {
-    if (ztoolkit.isZotero7()) {
-      container.innerHTML = html;
-    } else {
-      container.innerHTML = "";
-      container.appendChild(
-        ztoolkit.getDOMParser().parseFromString(html, "text/html").body,
-      );
-    }
+    container.innerHTML = html;
   }
 }
 
diff --git a/src/modules/workspace/content.ts b/src/modules/workspace/content.ts
index 86de793..1f2a863 100644
--- a/src/modules/workspace/content.ts
+++ b/src/modules/workspace/content.ts
@@ -158,26 +158,6 @@ export function initWorkspace(container: XUL.Box | undefined) {
             flex: "1",
             width: "700",
           },
-          styles: ztoolkit.isZotero7()
-            ? {}
-            : {
-                display: "flex",
-                flexDirection: "column",
-              },
-          children: ztoolkit.isZotero7()
-            ? []
-            : [
-                {
-                  tag: "zoteronoteeditor",
-                  namespace: "html",
-                  id: makeId("editor-main"),
-                  attributes: { flex: "1" },
-                  styles: {
-                    display: "flex",
-                    height: "100%",
-                  },
-                },
-              ],
         },
         {
           tag: "splitter",
@@ -196,51 +176,29 @@ export function initWorkspace(container: XUL.Box | undefined) {
             flex: "1",
             width: "500",
           },
-          styles: ztoolkit.isZotero7()
-            ? {}
-            : {
-                display: "flex",
-                flexDirection: "column",
-              },
-          children: ztoolkit.isZotero7()
-            ? []
-            : [
-                {
-                  tag: "zoteronoteeditor",
-                  namespace: "html",
-                  id: makeId("editor-preview"),
-                  attributes: { flex: "1" },
-                  styles: {
-                    display: "flex",
-                    height: "100%",
-                  },
-                },
-              ],
         },
       ],
     },
     container,
   );
   // Manually add custom editor items in Zotero 7
-  if (ztoolkit.isZotero7()) {
-    // @ts-ignore
-    const customElements = container.ownerGlobal
-      .customElements as CustomElementRegistry;
-    const mainEditorContainer = container.querySelector(
-      `#${makeId("editor-main-container")}`,
-    );
-    const previewEditorContainer = container.querySelector(
-      `#${makeId("editor-preview-container")}`,
-    );
-    const mainEditor = new (customElements.get("note-editor")!)();
-    mainEditor.id = makeId("editor-main");
-    mainEditor.setAttribute("flex", "1");
-    const previewEditor = new (customElements.get("note-editor")!)();
-    previewEditor.id = makeId("editor-preview");
-    previewEditor.setAttribute("flex", "1");
-    mainEditorContainer?.append(mainEditor);
-    previewEditorContainer?.append(previewEditor);
-  }
+  // @ts-ignore
+  const customElements = container.ownerGlobal
+    .customElements as CustomElementRegistry;
+  const mainEditorContainer = container.querySelector(
+    `#${makeId("editor-main-container")}`,
+  );
+  const previewEditorContainer = container.querySelector(
+    `#${makeId("editor-preview-container")}`,
+  );
+  const mainEditor = new (customElements.get("note-editor")!)();
+  mainEditor.id = makeId("editor-main");
+  mainEditor.setAttribute("flex", "1");
+  const previewEditor = new (customElements.get("note-editor")!)();
+  previewEditor.id = makeId("editor-preview");
+  previewEditor.setAttribute("flex", "1");
+  mainEditorContainer?.append(mainEditor);
+  previewEditorContainer?.append(previewEditor);
 
   const outlineContainer = container.querySelector(
     `#${makeId("outline-container")}`,
diff --git a/src/modules/workspace/tab.ts b/src/modules/workspace/tab.ts
index aeb5547..80ad465 100644
--- a/src/modules/workspace/tab.ts
+++ b/src/modules/workspace/tab.ts
@@ -94,12 +94,7 @@ function hoverWorkspaceTab(hovered: boolean) {
   const content = tabElem.querySelector(".tab-name") as HTMLDivElement;
   content.removeAttribute("style");
   if (hovered) {
-    if (ztoolkit.isZotero7()) {
-      content.style["-moz-box-pack" as any] = "start";
-    } else {
-      content.style.position = "absolute";
-      content.style.left = "22px";
-    }
+    content.style["-moz-box-pack" as any] = "start";
   }
 }
 
diff --git a/src/utils/itemPicker.ts b/src/utils/itemPicker.ts
index e96b996..7079a6d 100644
--- a/src/utils/itemPicker.ts
+++ b/src/utils/itemPicker.ts
@@ -6,10 +6,8 @@ export async function itemPicker() {
     deferred: Zotero.Promise.defer(),
   };
 
-  (window as unknown as XUL.XULWindow).openDialog(
-    ztoolkit.isZotero7()
-      ? "chrome://zotero/content/selectItemsDialog.xhtml"
-      : "chrome://zotero/content/selectItemsDialog.xul",
+  window.openDialog(
+    "chrome://zotero/content/selectItemsDialog.xhtml",
     "",
     "chrome,dialog=no,centerscreen,resizable=yes",
     io,