diff --git a/frontend/src/metabase-lib/queries/NativeQuery.ts b/frontend/src/metabase-lib/queries/NativeQuery.ts
index 911f1243ceb110d9cc5395b15b81a1ab8bfb9970..56fa3ebd3b49378bd324ea2afc419d787fcc3582 100644
--- a/frontend/src/metabase-lib/queries/NativeQuery.ts
+++ b/frontend/src/metabase-lib/queries/NativeQuery.ts
@@ -153,13 +153,6 @@ export default class NativeQuery extends AtomicQuery {
 
   /* Methods unique to this query type */
 
-  /**
-   * @returns a new query with the provided Database set.
-   */
-  setDatabase(database: Database): NativeQuery {
-    return this.setDatabaseId(database.id);
-  }
-
   setDatabaseId(databaseId: DatabaseId): NativeQuery {
     if (databaseId !== this._databaseId()) {
       // TODO: this should reset the rest of the query?
diff --git a/frontend/src/metabase-lib/queries/StructuredQuery.ts b/frontend/src/metabase-lib/queries/StructuredQuery.ts
index bd026bfec118a06bfa5762e5d115f51a2cf4f625..632871d53254acba9121b91c47be11c99000e6dd 100644
--- a/frontend/src/metabase-lib/queries/StructuredQuery.ts
+++ b/frontend/src/metabase-lib/queries/StructuredQuery.ts
@@ -196,31 +196,6 @@ class StructuredQuery extends AtomicQuery {
     return this._updateQuery(fn, []);
   }
 
-  /**
-   * @returns a new query with the provided Database set.
-   */
-  setDatabase(database: Database): StructuredQuery {
-    return this.setDatabaseId(database.id);
-  }
-
-  /**
-   * @returns a new query with the provided Database ID set.
-   */
-  setDatabaseId(databaseId: DatabaseId): StructuredQuery {
-    if (databaseId !== this._databaseId()) {
-      // TODO: this should reset the rest of the query?
-      return new StructuredQuery(
-        this._originalQuestion,
-        chain(this.datasetQuery())
-          .assoc("database", databaseId)
-          .assoc("query", {})
-          .value(),
-      );
-    } else {
-      return this;
-    }
-  }
-
   /**
    * @returns the table ID, if a table is selected.
    * @deprecated Use MLv2
diff --git a/frontend/test/metabase-lib/lib/queries/StructuredQuery.unit.spec.js b/frontend/test/metabase-lib/lib/queries/StructuredQuery.unit.spec.js
index f26cfe4ffe590654c94a0edf74313f869ea3b7ee..a986ddd1d7cebdbd8a6490c5ad328a82d5504fbf 100644
--- a/frontend/test/metabase-lib/lib/queries/StructuredQuery.unit.spec.js
+++ b/frontend/test/metabase-lib/lib/queries/StructuredQuery.unit.spec.js
@@ -1,3 +1,4 @@
+import { chain } from "icepick";
 import { createMockMetadata } from "__support__/metadata";
 import {
   createMockDatabase,
@@ -277,9 +278,15 @@ describe("StructuredQuery", () => {
 
       describe("when the query is missing a database", () => {
         it("should not include db schemas in dependent  metadata", () => {
-          const dependentMetadata = query
-            .setDatabaseId(null)
-            .dependentMetadata();
+          const queryWithoutDatabase = new StructuredQuery(
+            query._originalQuestion,
+            chain(query.datasetQuery())
+              .assoc("database", null)
+              .assoc("query", {})
+              .value(),
+          );
+
+          const dependentMetadata = queryWithoutDatabase.dependentMetadata();
 
           expect(dependentMetadata.some(({ type }) => type === "schema")).toBe(
             false,
@@ -302,12 +309,6 @@ describe("StructuredQuery", () => {
         ).toBe(ORDERS_ID);
       });
     });
-    describe("setDatabase", () => {
-      it("allows you to set a new database", () => {
-        const db = metadata.database(ANOTHER_DB_ID);
-        expect(query.setDatabase(db)._database().id).toBe(db.id);
-      });
-    });
     describe("_sourceTableId", () => {
       it("Return the right table id", () => {
         expect(query._sourceTableId()).toBe(ORDERS_ID);