diff --git a/frontend/src/metabase-lib/lib/Question.ts b/frontend/src/metabase-lib/lib/Question.ts
index c6df78dc0b041d29752bf0c9eac6fc604bdedf76..fde5d351016b962a432f921ea86ff5de476655ba 100644
--- a/frontend/src/metabase-lib/lib/Question.ts
+++ b/frontend/src/metabase-lib/lib/Question.ts
@@ -1298,6 +1298,3 @@ export default class Question {
     return getIn(this, ["_card", "moderation_reviews"]) || [];
   }
 }
-window.Question = Question;
-window.NativeQuery = NativeQuery;
-window.StructuredQuery = StructuredQuery;
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.jsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.jsx
index 54ffa540eef18d4d44d3e788696bb966b4b32f9e..415e46d69106512574f4ce5fd2c7990b4c500c58 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.jsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.jsx
@@ -203,7 +203,6 @@ export default class QueryBuilder extends Component {
     //    @connect(null, { updateQuestion })
     //    @connect(mapStateToProps, mapDispatchToProps)
     if (nextProps.question) {
-      window.question = nextProps.question;
       nextProps.question._update = nextProps.updateQuestion;
     }
   }