diff --git a/app/assets/javascripts/discourse/app/initializers/live-development.js b/app/assets/javascripts/discourse/app/initializers/live-development.js
index df259905ad7..29421d0471b 100644
--- a/app/assets/javascripts/discourse/app/initializers/live-development.js
+++ b/app/assets/javascripts/discourse/app/initializers/live-development.js
@@ -1,9 +1,11 @@
 import DiscourseURL from "discourse/lib/url";
 import { isDevelopment } from "discourse-common/config/environment";
+import { later } from "@ember/runloop";
 
 //  Use the message bus for live reloading of components for faster development.
 export default {
   name: "live-development",
+
   initialize(container) {
     const messageBus = container.lookup("message-bus:main");
     const session = container.lookup("session:main");
@@ -30,17 +32,6 @@ export default {
       });
     }
 
-    // Custom header changes
-    $("header.custom").each(function () {
-      const header = $(this);
-      return messageBus.subscribe(
-        "/header-change/" + $(this).data("id"),
-        function (data) {
-          return header.html(data);
-        }
-      );
-    });
-
     // Useful to export this for debugging purposes
     if (isDevelopment()) {
       window.DiscourseURL = DiscourseURL;
@@ -79,14 +70,9 @@ export default {
   },
 
   refreshCSS(node, newHref) {
-    let reloaded = node.cloneNode(true);
+    const reloaded = node.cloneNode(true);
     reloaded.href = newHref;
     node.insertAdjacentElement("afterend", reloaded);
-
-    setTimeout(() => {
-      if (node && node.parentNode) {
-        node.parentNode.removeChild(node);
-      }
-    }, 500);
+    later(() => node?.parentNode?.removeChild(node), 500);
   },
 };
diff --git a/app/models/theme_field.rb b/app/models/theme_field.rb
index 0e3c8663f3a..e35d2cedfab 100644
--- a/app/models/theme_field.rb
+++ b/app/models/theme_field.rb
@@ -580,12 +580,6 @@ class ThemeField < ActiveRecord::Base
     dependent_fields.each(&:invalidate_baked!)
   end
 
-  after_commit do
-    # TODO message for mobile vs desktop
-    MessageBus.publish "/header-change/#{theme.id}", self.value if theme && self.name == "header"
-    MessageBus.publish "/footer-change/#{theme.id}", self.value if theme && self.name == "footer"
-  end
-
   after_destroy do
     if svg_sprite_field?
       DB.after_commit { SvgSprite.expire_cache }