diff --git a/enterprise/frontend/src/metabase-enterprise/license/index.js b/enterprise/frontend/src/metabase-enterprise/license/index.js
index d3ab7f75252af3fc84cdba513f9a600a59db92a1..e278555e2db54ffcf9756f1ecc309442c0952a0c 100644
--- a/enterprise/frontend/src/metabase-enterprise/license/index.js
+++ b/enterprise/frontend/src/metabase-enterprise/license/index.js
@@ -1,5 +1,4 @@
 import { t } from "ttag";
-import _ from "underscore";
 import { updateIn } from "icepick";
 import { PLUGIN_ADMIN_SETTINGS_UPDATES } from "metabase/plugins";
 import LicenseAndBillingSettings from "./components/LicenseAndBillingSettings";
diff --git a/frontend/src/metabase/admin/people/components/GroupDetail.jsx b/frontend/src/metabase/admin/people/components/GroupDetail.jsx
index 2ed0604392fa931178f7cf7eba5617554e4c1546..c770dddfa635649a914f875c97205ca954cf484a 100644
--- a/frontend/src/metabase/admin/people/components/GroupDetail.jsx
+++ b/frontend/src/metabase/admin/people/components/GroupDetail.jsx
@@ -2,7 +2,6 @@
 import React, { useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { t, ngettext, msgid } from "ttag";
-import _ from "underscore";
 
 import {
   isAdminGroup,
diff --git a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
index b95de9bdaef528b133d55620fea5cbd5ba5fc08a..ac299012755c6cb992d0411e184d80a5ed230f2a 100644
--- a/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
+++ b/frontend/src/metabase/admin/people/components/MembershipSelect/MembershipSelect.tsx
@@ -1,6 +1,5 @@
 import React from "react";
 import { t } from "ttag";
-import _ from "underscore";
 
 import Icon from "metabase/components/Icon";
 import PopoverWithTrigger from "metabase/components/PopoverWithTrigger";
diff --git a/frontend/src/metabase/admin/people/components/PeopleListRow.jsx b/frontend/src/metabase/admin/people/components/PeopleListRow.jsx
index 135565bbcce40ee043fcd435c4ef68d212b0d6a3..4b710f3b98730df8f0714b789729aa820e469b8b 100644
--- a/frontend/src/metabase/admin/people/components/PeopleListRow.jsx
+++ b/frontend/src/metabase/admin/people/components/PeopleListRow.jsx
@@ -2,7 +2,6 @@
 import React, { useMemo } from "react";
 import { t } from "ttag";
 import moment from "moment-timezone";
-import _ from "underscore";
 
 import { color } from "metabase/lib/colors";
 import { getFullName } from "metabase/lib/user";
diff --git a/frontend/src/metabase/admin/people/selectors.js b/frontend/src/metabase/admin/people/selectors.js
index 75e88de67158b652eb8e0058d4059f2be4bc43b2..09ab1ac33bc0b72f7288874235176d53ec12350c 100644
--- a/frontend/src/metabase/admin/people/selectors.js
+++ b/frontend/src/metabase/admin/people/selectors.js
@@ -1,5 +1,4 @@
 import { createSelector } from "reselect";
-import _ from "underscore";
 
 export const getMemberships = state => state.admin.people.memberships;
 
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts
index 5956550c2acc350d5d011f72b161c54f07bb8ce5..36d330a264d28ac6acccf82046b43254a04f5bf8 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/breadcrumbs.ts
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import { Group } from "metabase-types/api";
 import type Metadata from "metabase-lib/lib/metadata/Metadata";
 import type Schema from "metabase-lib/lib/metadata/Schema";
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
index dd843cb12d4b53bc5fe988ae6cbf2f32e18289ee..cdf0d22de1393ecbf37325677827f20cace3660e 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
@@ -1,6 +1,5 @@
 import { createSelector } from "reselect";
 import { t } from "ttag";
-import _ from "underscore";
 
 import { getMetadataWithHiddenTables } from "metabase/selectors/metadata";
 
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts
index 2ec76a43e37cb0bddf1d6e03e4a76f34df9b8d7f..ec8fcdc647607f84788c7aa03b7bb8375ec82f04 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/fields.ts
@@ -1,5 +1,3 @@
-import _ from "underscore";
-
 import {
   getFieldsPermission,
   getNativePermission,
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts
index b48b3ba1354687b17d0bb64614bdea47ae69f01d..15fc5f53000241f6999d07dcd5035389aeecac46 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/group-sidebar.ts
@@ -1,6 +1,5 @@
 import { createSelector } from "reselect";
 import { t } from "ttag";
-import _ from "underscore";
 
 import { State } from "metabase-types/store";
 import { Group } from "metabase-types/api";
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts
index b7ae96730be402c399010a2ca75891a2bcc79420..cbfc1c09c7163b896d1f3e3e2aec7854cf07b5f0 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/schemas.ts
@@ -1,5 +1,3 @@
-import _ from "underscore";
-
 import {
   getNativePermission,
   getSchemasPermission,
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts
index 0ef33b278ee67e9673d11d0f924d7496ace04dc2..e031d46ccacc6b66089fda773d0a0bd270e03a72 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/tables.ts
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import { push } from "react-router-redux";
 
 import {
diff --git a/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts b/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts
index fb6ab6a738d792cfbc743b1376d303f4d2a17c17..11d081b16b8869a7a0b63dd1e30e7a7332d2882d 100644
--- a/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts
+++ b/frontend/src/metabase/admin/permissions/utils/graph/permissions-diff.ts
@@ -1,5 +1,3 @@
-import _ from "underscore";
-
 import type {
   Group,
   GroupsPermissions,
diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.stories.tsx b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.stories.tsx
index 614432bae200fbd1aa21d3e85404b45df71dfbac..98a93ef6c736ec0a5f5927e0433ea3d55723c3d2 100644
--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.stories.tsx
+++ b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.stories.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import _ from "underscore";
+
 import { action } from "@storybook/addon-actions";
 import { ComponentStory } from "@storybook/react";
 import PinnedItemCard from "./PinnedItemCard";
diff --git a/frontend/src/metabase/components/DateAllOptionsWidget/DateAllOptionsWidget.tsx b/frontend/src/metabase/components/DateAllOptionsWidget/DateAllOptionsWidget.tsx
index d5a1d406293354e9d7fae6190685c32dddd45dcd..2e8e7389b6c4d9c995b55f9fc4fb588218e0e4c9 100644
--- a/frontend/src/metabase/components/DateAllOptionsWidget/DateAllOptionsWidget.tsx
+++ b/frontend/src/metabase/components/DateAllOptionsWidget/DateAllOptionsWidget.tsx
@@ -1,6 +1,5 @@
 import React, { useState } from "react";
 import { t } from "ttag";
-import _ from "underscore";
 import cx from "classnames";
 
 import { dateParameterValueToMBQL } from "metabase/parameters/utils/mbql";
diff --git a/frontend/src/metabase/core/components/Select/Select.stories.tsx b/frontend/src/metabase/core/components/Select/Select.stories.tsx
index 68ae0a8174d2d768810e402809a739c3a4a73a77..c6a5e85291e6c88e5fcd46e26be5f06135623335 100644
--- a/frontend/src/metabase/core/components/Select/Select.stories.tsx
+++ b/frontend/src/metabase/core/components/Select/Select.stories.tsx
@@ -1,5 +1,4 @@
 import React from "react";
-import _ from "underscore";
 import { ComponentStory } from "@storybook/react";
 import { field_semantic_types } from "metabase/lib/core";
 import Select from "./Select";
diff --git a/frontend/src/metabase/dashboard/actions/revisions.js b/frontend/src/metabase/dashboard/actions/revisions.js
index 36f296dc9ec8e7784c5284d1067572164e8df09e..c2f0c706cc9c80784b899da5a52b5638e42d2d4d 100644
--- a/frontend/src/metabase/dashboard/actions/revisions.js
+++ b/frontend/src/metabase/dashboard/actions/revisions.js
@@ -1,5 +1,3 @@
-import _ from "underscore";
-
 import { createThunkAction } from "metabase/lib/redux";
 
 import { fetchDashboard, fetchDashboardCardData } from "./data-fetching";
diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/ValuesYouCanReference.jsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/ValuesYouCanReference.jsx
index 4b134ae4ddf1fe210c94c4214f152c8b2ddf7ea0..cf7b159a19eb69effb986ca3f4d282ba6dd8b9db 100644
--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/ValuesYouCanReference.jsx
+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/ValuesYouCanReference.jsx
@@ -1,7 +1,6 @@
 /* eslint-disable react/prop-types */
 import React from "react";
 import { t } from "ttag";
-import _ from "underscore";
 
 import AccordionList from "metabase/core/components/AccordionList";
 import Icon from "metabase/components/Icon";
diff --git a/frontend/src/metabase/hoc/Favicon.jsx b/frontend/src/metabase/hoc/Favicon.jsx
index 578b22b9a455dc2aadb4f6bee56aea9233fe8e40..472d70e197e1201c9883d101e10875409c15ef07 100644
--- a/frontend/src/metabase/hoc/Favicon.jsx
+++ b/frontend/src/metabase/hoc/Favicon.jsx
@@ -1,5 +1,4 @@
 import React, { useEffect } from "react";
-import _ from "underscore";
 import MetabaseSettings from "../lib/settings";
 
 const DEFAULT_FAVICON = () => MetabaseSettings.get("application-favicon-url");
diff --git a/frontend/src/metabase/lib/card.js b/frontend/src/metabase/lib/card.js
index 24448d39bf1a708aefcf9dffcc40b8f7a8b35a55..11951de7704b6562a06e8497005354cd5a0fba94 100644
--- a/frontend/src/metabase/lib/card.js
+++ b/frontend/src/metabase/lib/card.js
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import * as Q_DEPRECATED from "metabase/lib/query";
 import Utils from "metabase/lib/utils";
 
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx
index bdb2d1ea752c5478efa327e9ea8754b9a388d5c2..c4967f580534fa3eb457311e52c414f18797cf8a 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/SidebarItems/SidebarCollectionLink.tsx
@@ -1,5 +1,4 @@
 import React, { useEffect, useCallback, useRef, KeyboardEvent } from "react";
-import _ from "underscore";
 
 import { Collection } from "metabase-types/api";
 
diff --git a/frontend/src/metabase/query_builder/actions/core/core.js b/frontend/src/metabase/query_builder/actions/core/core.js
index bdc9d499785094a4f39f6057bb7c7a7bef67a6fa..605f9575a8e877d3e18b9f223efc9dfa6829a35c 100644
--- a/frontend/src/metabase/query_builder/actions/core/core.js
+++ b/frontend/src/metabase/query_builder/actions/core/core.js
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import { createAction } from "redux-actions";
 
 import * as MetabaseAnalytics from "metabase/lib/analytics";
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
index 60a2a0219b54e9fd42665b9eafc6bcc651a00b27..48959a3435a0f22ca64e1ef2859f4becff4339f3 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import querystring from "querystring";
 import { LocationDescriptorObject } from "history";
 
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
index 9ca88e28754e323df88f6f07aa3f4995e62add49..5a1f9c1f81d2dd43899cf4eaeb5864662039f623 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts
@@ -1,5 +1,5 @@
 import { LocationDescriptorObject } from "history";
-import _ from "underscore";
+
 import xhrMock from "xhr-mock";
 
 import * as CardLib from "metabase/lib/card";
diff --git a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
index fb487e4cc5239dce0ffae9c9c326a09436b3ab62..fabb2fd79f2520a34caf1b6a8ea4c9d44770e42b 100644
--- a/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
+++ b/frontend/src/metabase/query_builder/actions/core/updateQuestion.unit.spec.ts
@@ -1,5 +1,3 @@
-import _ from "underscore";
-
 import { createMockDataset } from "metabase-types/api/mocks";
 import { Card, StructuredDatasetQuery } from "metabase-types/types/Card";
 import { ConcreteField, TemplateTag } from "metabase-types/types/Query";
diff --git a/frontend/src/metabase/query_builder/actions/models.js b/frontend/src/metabase/query_builder/actions/models.js
index 123fca3903e49c1f4379539f6cc87a450ae2e0f5..6c94ead82efac0bb36d19eafe4f70fee4fd0b249 100644
--- a/frontend/src/metabase/query_builder/actions/models.js
+++ b/frontend/src/metabase/query_builder/actions/models.js
@@ -1,5 +1,4 @@
 import { createAction } from "redux-actions";
-import _ from "underscore";
 import { merge } from "icepick";
 import { t } from "ttag";
 
diff --git a/frontend/src/metabase/query_builder/actions/native.js b/frontend/src/metabase/query_builder/actions/native.js
index 388308d79a374ee2572bbeeacd4dc5db3f83db57..8455609c935003fee16caeffad31bb15a63cd4be 100644
--- a/frontend/src/metabase/query_builder/actions/native.js
+++ b/frontend/src/metabase/query_builder/actions/native.js
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import { assoc, updateIn } from "icepick";
 
 import { createAction } from "redux-actions";
diff --git a/frontend/src/metabase/query_builder/actions/querying.js b/frontend/src/metabase/query_builder/actions/querying.js
index 6b91b2518e7170cafa962998998231538b98a3dd..23c44a1b5eed90fa55e00a6fe34f38ad905a5d2f 100644
--- a/frontend/src/metabase/query_builder/actions/querying.js
+++ b/frontend/src/metabase/query_builder/actions/querying.js
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import { t } from "ttag";
 import { createAction } from "redux-actions";
 
diff --git a/frontend/src/metabase/query_builder/actions/ui.js b/frontend/src/metabase/query_builder/actions/ui.js
index 252c413a15c7992d80e17bd035c1f41fd8660d49..b449f478fa55ff088ec42d38e7b054e53a055b19 100644
--- a/frontend/src/metabase/query_builder/actions/ui.js
+++ b/frontend/src/metabase/query_builder/actions/ui.js
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import { createAction } from "redux-actions";
 
 import * as MetabaseAnalytics from "metabase/lib/analytics";
diff --git a/frontend/src/metabase/query_builder/actions/visualization-settings.js b/frontend/src/metabase/query_builder/actions/visualization-settings.js
index 184e3c9bb555c81530965d414f40c4bf035abbee..c3c6676457975d32ad20dff2922ce0f0bd2ebe2e 100644
--- a/frontend/src/metabase/query_builder/actions/visualization-settings.js
+++ b/frontend/src/metabase/query_builder/actions/visualization-settings.js
@@ -1,5 +1,3 @@
-import _ from "underscore";
-
 import {
   getDatasetEditorTab,
   getPreviousQueryBuilderMode,
diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-question-picker/SavedQuestionList.jsx b/frontend/src/metabase/query_builder/components/DataSelector/saved-question-picker/SavedQuestionList.jsx
index 064f863eb3c1df6ccd649695da22196c60694643..354c1a067f19f6ccc2a5eb8f53a825316ae66b5d 100644
--- a/frontend/src/metabase/query_builder/components/DataSelector/saved-question-picker/SavedQuestionList.jsx
+++ b/frontend/src/metabase/query_builder/components/DataSelector/saved-question-picker/SavedQuestionList.jsx
@@ -1,7 +1,6 @@
 import React from "react";
 import { t } from "ttag";
 import PropTypes from "prop-types";
-import _ from "underscore";
 
 import { PLUGIN_MODERATION } from "metabase/plugins";
 import Schemas from "metabase/entities/schemas";
diff --git a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx
index 7130616272c0a80b335009f0df266c1b1a9d019c..f8e01fba947b3c2055bc4ffd8fc6a2cb9a3f4886 100644
--- a/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx
+++ b/frontend/src/metabase/query_builder/components/DatasetEditor/DatasetFieldMetadataSidebar/MappedFieldPicker/MappedFieldPicker.tsx
@@ -1,6 +1,5 @@
 import React, { useCallback, useRef } from "react";
 import { t } from "ttag";
-import _ from "underscore";
 
 import { isVirtualCardId } from "metabase/lib/saved-questions";
 import { SchemaTableAndFieldDataSelector } from "metabase/query_builder/components/DataSelector";
diff --git a/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker/DatePickerFooter.tsx b/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker/DatePickerFooter.tsx
index 0d231ab728fd63991428a10fbc7bd9ac2696f37d..2210a7fd2113f3e98c3ab27733d51f561fd082ef 100644
--- a/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker/DatePickerFooter.tsx
+++ b/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker/DatePickerFooter.tsx
@@ -2,7 +2,6 @@
 import React from "react";
 import { t } from "ttag";
 import moment from "moment-timezone";
-import _ from "underscore";
 
 import Icon from "metabase/components/Icon";
 import {
diff --git a/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker/DatePickerShortcuts.tsx b/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker/DatePickerShortcuts.tsx
index 9d3e979151112fb7b759afda0965699ae53f1e3c..d2f91025d28a711d8c454426ec73548ae86eec85 100644
--- a/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker/DatePickerShortcuts.tsx
+++ b/frontend/src/metabase/query_builder/components/filters/pickers/DatePicker/DatePickerShortcuts.tsx
@@ -1,5 +1,4 @@
 import React, { useMemo } from "react";
-import _ from "underscore";
 
 import SidebarHeader from "metabase/query_builder/components/SidebarHeader";
 import { Filter as FilterExpression } from "metabase-types/types/Query";
diff --git a/frontend/src/metabase/reducers-main.js b/frontend/src/metabase/reducers-main.js
index 0019e49f4b0e7ce32fe24741dbf332646304c9bb..a5079895bdc96dd7e3b69ffaa2fc2291bcb31d91 100644
--- a/frontend/src/metabase/reducers-main.js
+++ b/frontend/src/metabase/reducers-main.js
@@ -1,7 +1,6 @@
 // Reducers needed for main application
 
 import { combineReducers } from "redux";
-import _ from "underscore";
 
 import { PLUGIN_REDUCERS } from "metabase/plugins";
 
diff --git a/frontend/src/metabase/visualizations/components/List/ListCell.tsx b/frontend/src/metabase/visualizations/components/List/ListCell.tsx
index 43ba22c936dd751b1c848d967ebf898500df8f62..1d967858716ceffe8760df07c220524a6949065d 100644
--- a/frontend/src/metabase/visualizations/components/List/ListCell.tsx
+++ b/frontend/src/metabase/visualizations/components/List/ListCell.tsx
@@ -1,6 +1,5 @@
 import React, { useMemo } from "react";
 import cx from "classnames";
-import _ from "underscore";
 
 import ExternalLink from "metabase/core/components/ExternalLink";
 
diff --git a/frontend/src/metabase/visualizations/components/TableSimple/TableCell.jsx b/frontend/src/metabase/visualizations/components/TableSimple/TableCell.jsx
index 2c4eb74951f1b76418c349bdfa2d8bf1926625e5..4b16ccd1b61c9aa2e9bbbe9154bdf52903a2ff1a 100644
--- a/frontend/src/metabase/visualizations/components/TableSimple/TableCell.jsx
+++ b/frontend/src/metabase/visualizations/components/TableSimple/TableCell.jsx
@@ -1,7 +1,6 @@
 /* eslint-disable react/prop-types */
 import React, { useMemo } from "react";
 import cx from "classnames";
-import _ from "underscore";
 
 import ExternalLink from "metabase/core/components/ExternalLink";
 
diff --git a/frontend/src/metabase/visualizations/lib/apply_tooltips.js b/frontend/src/metabase/visualizations/lib/apply_tooltips.js
index 00bf983395e130335426ed53e826e8835db2c2f3..584391ccd9d4ba187fdb1e02440a5f114825b9b3 100644
--- a/frontend/src/metabase/visualizations/lib/apply_tooltips.js
+++ b/frontend/src/metabase/visualizations/lib/apply_tooltips.js
@@ -3,7 +3,6 @@
 import d3 from "d3";
 import moment from "moment-timezone";
 import { getIn } from "icepick";
-import _ from "underscore";
 
 import { formatValue } from "metabase/lib/formatting";
 
diff --git a/frontend/test/metabase-lib/lib/Dimension.unit.spec.js b/frontend/test/metabase-lib/lib/Dimension.unit.spec.js
index 92eacdee6410675445138ce066aea505ec6dc60c..88272fd527a28b2f2b13a6127161609751615052 100644
--- a/frontend/test/metabase-lib/lib/Dimension.unit.spec.js
+++ b/frontend/test/metabase-lib/lib/Dimension.unit.spec.js
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import {
   metadata,
   ORDERS,
diff --git a/frontend/test/metabase-visual/notebook/notebook.cy.spec.js b/frontend/test/metabase-visual/notebook/notebook.cy.spec.js
index 4cc230de6840facd5612c58d5b30fd596a3b01a9..e5f39dea581dfbe302186eadb05c14836e4b10f8 100644
--- a/frontend/test/metabase-visual/notebook/notebook.cy.spec.js
+++ b/frontend/test/metabase-visual/notebook/notebook.cy.spec.js
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import { restore, popover, startNewQuestion } from "__support__/e2e/helpers";
 
 describe("visual tests > notebook > major UI elements", () => {
diff --git a/frontend/test/metabase/scenarios/admin/people/group-managers.cy.spec.js b/frontend/test/metabase/scenarios/admin/people/group-managers.cy.spec.js
index bbbb84fc5ab2e47973b9515ce9582228e0533c77..3538e3b6215280b5e19736af18bb067746bc8c45 100644
--- a/frontend/test/metabase/scenarios/admin/people/group-managers.cy.spec.js
+++ b/frontend/test/metabase/scenarios/admin/people/group-managers.cy.spec.js
@@ -1,4 +1,3 @@
-import _ from "underscore";
 import {
   restore,
   modal,
diff --git a/frontend/test/metabase/scenarios/filters/relative-datetime.cy.spec.js b/frontend/test/metabase/scenarios/filters/relative-datetime.cy.spec.js
index 75301a4a8cf3b8b875ba4f3d80e719c02c6ac865..bda912ca3239b70e9719215267dc2a9b2ac9bef8 100644
--- a/frontend/test/metabase/scenarios/filters/relative-datetime.cy.spec.js
+++ b/frontend/test/metabase/scenarios/filters/relative-datetime.cy.spec.js
@@ -1,5 +1,4 @@
 import moment from "moment-timezone";
-import _ from "underscore";
 import { restore, popover, openOrdersTable } from "__support__/e2e/helpers";
 
 const STARTING_FROM_UNITS = [