diff --git a/.babelrc b/.babelrc
index f98143660cc0051f5ad33cd36184a298534875f9..09fb38d4e09720c43586cf30cdb3f31c26ed0d01 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,7 +1,6 @@
 {
   "plugins": [
     "babel-plugin-styled-components",
-    "@babel/plugin-transform-flow-strip-types",
     "@babel/plugin-proposal-export-default-from",
     ["@babel/plugin-proposal-decorators", { "legacy": true }]
   ],
diff --git a/frontend/test/metabase-lib/lib/queries/NativeQuery.unit.spec.js b/frontend/test/metabase-lib/lib/queries/NativeQuery.unit.spec.js
index 9b6917972b64f0c66cd6613d7a90d9911ea13fab..ddcf593e50e42cf9a95e075d65aaf375743325b5 100644
--- a/frontend/test/metabase-lib/lib/queries/NativeQuery.unit.spec.js
+++ b/frontend/test/metabase-lib/lib/queries/NativeQuery.unit.spec.js
@@ -33,7 +33,7 @@ function makeMongoQuery(query, templateTags) {
   );
 }
 
-const query: NativeQuery = makeQuery("");
+const query = makeQuery("");
 
 describe("NativeQuery", () => {
   describe("You can access the metadata for the database a query has been written against", () => {
diff --git a/frontend/test/metabase/query_builder/components/GuiQueryEditor.unit.spec.js b/frontend/test/metabase/query_builder/components/GuiQueryEditor.unit.spec.js
index b1b407b7c63da5ee7c4ffd32bf7a587de2536aca..4eb214249d177d464a85717b04ae9fb5dd2793ed 100644
--- a/frontend/test/metabase/query_builder/components/GuiQueryEditor.unit.spec.js
+++ b/frontend/test/metabase/query_builder/components/GuiQueryEditor.unit.spec.js
@@ -9,8 +9,6 @@ import {
   metadata,
 } from "__support__/sample_dataset_fixture";
 
-import StructuredQuery from "metabase-lib/lib/queries/StructuredQuery";
-
 const getGuiQueryEditor = query => (
   <GuiQueryEditor
     query={query}
@@ -25,7 +23,7 @@ const getGuiQueryEditor = query => (
 
 describe("GuiQueryEditor", () => {
   it("should allow adding the first breakout", () => {
-    const query: StructuredQuery = Question.create({
+    const query = Question.create({
       databaseId: SAMPLE_DATASET.id,
       tableId: ORDERS.id,
       metadata,
@@ -42,7 +40,7 @@ describe("GuiQueryEditor", () => {
   });
 
   it("should allow adding more than one breakout", () => {
-    const query: StructuredQuery = Question.create({
+    const query = Question.create({
       databaseId: SAMPLE_DATASET.id,
       tableId: ORDERS.id,
       metadata,
diff --git a/package.json b/package.json
index 1b187986ccd97cc92148e6152e9895c89ccacfc7..e28e37d04ce45a06e1101da9878a3b7cc00b3a13 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,6 @@
     "@babel/node": "^7.14.7",
     "@babel/plugin-proposal-decorators": "^7.14.5",
     "@babel/plugin-proposal-export-default-from": "^7.14.5",
-    "@babel/plugin-transform-flow-strip-types": "^7.14.5",
     "@babel/preset-env": "^7.14.7",
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.15.0",
diff --git a/yarn.lock b/yarn.lock
index e8f67c0a45fbfc8d1a3fe49a306cf3c35fcf8c2f..de06ca35486fbe1d807b34e7aae27586f639420f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1265,13 +1265,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-flow@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.14.5.tgz#2ff654999497d7d7d142493260005263731da180"
-  integrity sha512-9WK5ZwKCdWHxVuU13XNT6X73FGmutAXeor5lGFq6qhOFtMFUF4jkbijuyUdZZlpYq6E2hZeZf/u3959X9wsv0Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
 "@babel/plugin-syntax-flow@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.16.0.tgz#07427021d093ed77019408221beaf0272bbcfaec"
@@ -1587,14 +1580,6 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.0"
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-flow-strip-types@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.14.5.tgz#0dc9c1d11dcdc873417903d6df4bed019ef0f85e"
-  integrity sha512-KhcolBKfXbvjwI3TV7r7TkYm8oNXHNBqGOy6JDVwtecFaRoKYsUUqJdS10q0YDKW1c6aZQgO+Ys3LfGkox8pXA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-flow" "^7.14.5"
-
 "@babel/plugin-transform-flow-strip-types@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.16.0.tgz#edd968dc2041c1b69e451a262e948d6654a79dc2"
@@ -21585,8 +21570,10 @@ watchpack@^1.7.4:
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453"
   integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==
   dependencies:
+    chokidar "^3.4.1"
     graceful-fs "^4.1.2"
     neo-async "^2.5.0"
+    watchpack-chokidar2 "^2.0.1"
   optionalDependencies:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"