diff --git a/rollup.config.js b/rollup.config.js
index bfaa4b1e..5da89167 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -54,5 +54,11 @@ export default [
       format: 'es',
     },
     plugins: [...plugins],
+    // These two files use this at the toplevel, which causes rollup warning
+    // spam on build: `this` has been rewritten to `undefined`
+    moduleContext: {
+      './node_modules/@formatjs/intl-utils/lib/src/diff.js': 'window',
+      './node_modules/@formatjs/intl-utils/lib/src/resolve-locale.js': 'window',
+    },
   },
 ];
diff --git a/src/editor.ts b/src/editor.ts
index 4e708d67..9e66ae70 100644
--- a/src/editor.ts
+++ b/src/editor.ts
@@ -6,7 +6,6 @@ import { HomeAssistant, LovelaceCardEditor, fireEvent } from 'custom-card-helper
 import { localize } from './localize/localize.js';
 import {
   BUTTON_SIZE_MIN,
-  CameraConfig,
   RawFrigateCardConfig,
   RawFrigateCardConfigArray,
   THUMBNAIL_WIDTH_MAX,
@@ -94,8 +93,6 @@ import {
   arrayMove,
   getCameraID,
   getCameraTitle,
-  getEntityTitle,
-  prettifyFrigateName,
 } from './common.js';
 import {
   copyConfig,