diff --git a/package.json b/package.json
index 9a3b5beb1e..fc793d7e09 100644
--- a/package.json
+++ b/package.json
@@ -108,10 +108,9 @@
     "@babel/preset-typescript": "^7.3.3",
     "@gfx/zopfli": "^1.0.11",
     "@types/chai": "^4.1.7",
-    "@types/codemirror": "^0.0.72",
     "@types/hls.js": "^0.12.3",
     "@types/leaflet": "^1.4.3",
-    "@types/memoize-one": "^4.1.1",
+    "@types/memoize-one": "4.1.0",
     "@types/mocha": "^5.2.6",
     "babel-eslint": "^10",
     "babel-loader": "^8.0.5",
diff --git a/src/panels/lovelace/components/hui-yaml-editor.ts b/src/panels/lovelace/components/hui-yaml-editor.ts
index f8f4abe8d4..99b2fec3fb 100644
--- a/src/panels/lovelace/components/hui-yaml-editor.ts
+++ b/src/panels/lovelace/components/hui-yaml-editor.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
 import CodeMirror from "codemirror";
 import "codemirror/mode/yaml/yaml";
 // @ts-ignore
@@ -20,14 +21,12 @@ declare global {
 export class HuiYamlEditor extends HTMLElement {
   public _hass?: HomeAssistant;
 
-  // @ts-ignore
-  public codemirror: CodeMirror;
+  public codemirror!: any;
 
   private _value: string;
 
   public constructor() {
     super();
-    // @ts-ignore
     CodeMirror.commands.save = (cm: CodeMirror) => {
       fireEvent(cm.getWrapperElement(), "yaml-save");
     };
diff --git a/test-mocha/common/entity/entity_filter.ts b/test-mocha/common/entity/entity_filter.ts
index fa58454da5..74f4b48e7b 100644
--- a/test-mocha/common/entity/entity_filter.ts
+++ b/test-mocha/common/entity/entity_filter.ts
@@ -1,6 +1,6 @@
-import { generateFilter } from "../../../src/common/entity/entity_filter";
+import { assert } from "chai";
 
-import assert from "assert";
+import { generateFilter } from "../../../src/common/entity/entity_filter";
 
 describe("EntityFilter", () => {
   // case 1
diff --git a/tsconfig.json b/tsconfig.json
index 68006f7071..ddc30c8b56 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,8 +15,6 @@
     "noImplicitAny": false,
     "skipLibCheck": true,
     "resolveJsonModule": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true
+    "experimentalDecorators": true
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 6c16736311..a0ae7e1bc2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1587,13 +1587,6 @@
   resolved "https://registry.yarnpkg.com/@types/clone/-/clone-0.1.30.tgz#e7365648c1b42136a59c7d5040637b3b5c83b614"
   integrity sha1-5zZWSMG0ITalnH1QQGN7O1yDthQ=
 
-"@types/codemirror@^0.0.72":
-  version "0.0.72"
-  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.72.tgz#75e95e3b488717605d2591cd80c4d2ed88ff276e"
-  integrity sha512-dKtEP139Jxdrog/6zW8akX3LdhJ3V8NjYNCpIHdBVVo6ZiYpShPamtQoGpVhzrUzTOu5A6NlozOSiZipCEVCow==
-  dependencies:
-    "@types/tern" "*"
-
 "@types/compression@^0.0.33":
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/@types/compression/-/compression-0.0.33.tgz#95dc733a2339aa846381d7f1377792d2553dc27d"
@@ -1635,7 +1628,7 @@
   resolved "https://registry.yarnpkg.com/@types/escape-html/-/escape-html-0.0.20.tgz#cae698714dd61ebee5ab3f2aeb9a34ba1011735a"
   integrity sha512-6dhZJLbA7aOwkYB2GDGdIqJ20wmHnkDzaxV9PJXe7O02I2dSFTERzRB6JrX6cWKaS+VqhhY7cQUMCbO5kloFUw==
 
-"@types/estree@*", "@types/estree@0.0.39":
+"@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
@@ -1775,10 +1768,10 @@
   dependencies:
     "@types/geojson" "*"
 
-"@types/memoize-one@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@types/memoize-one/-/memoize-one-4.1.1.tgz#41dd138a4335b5041f7d8fc038f9d593d88b3369"
-  integrity sha512-+9djKUUn8hOyktLCfCy4hLaIPgDNovaU36fsnZe9trFHr6ddlbIn2q0SEsnkCkNR+pBWEU440Molz/+Mpyf+gQ==
+"@types/memoize-one@4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@types/memoize-one/-/memoize-one-4.1.0.tgz#62119f26055b3193ae43ca1882c5b29b88b71ece"
+  integrity sha512-cmSgi6JMX/yBwgpVm4GooNWIH+vEeJoa8FAa6ExOhpJbC0Juq32/uYKiKb3VPSqrEA0aOnjvwZanla3O1WZMbw==
 
 "@types/merge-stream@^1.0.28":
   version "1.1.2"
@@ -2025,13 +2018,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/tern@*":
-  version "0.23.1"
-  resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.1.tgz#ff988e6194a8f28c9e422791e8104318782ae026"
-  integrity sha512-trSPYFUkLnyftlouhC8Kuoofq7RsfI46SdPzTuYcS7VLj7i70WNCAWY9AV/vA5YLqDuEu7dYW1/QMjYDrUjbjA==
-  dependencies:
-    "@types/estree" "*"
-
 "@types/through@*":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.29.tgz#72943aac922e179339c651fa34a4428a4d722f93"