diff --git a/src/PepperDash.Core/Logging/Debug.cs b/src/PepperDash.Core/Logging/Debug.cs
index 4160da21..fcb262b5 100644
--- a/src/PepperDash.Core/Logging/Debug.cs
+++ b/src/PepperDash.Core/Logging/Debug.cs
@@ -6,11 +6,8 @@ using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Timers;
 using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronDataStore;
 using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharp.CrestronLogger;
-using Formatting = NewtonsoftJson::Newtonsoft.Json.Formatting;
-using JsonConvert = NewtonsoftJson::Newtonsoft.Json.JsonConvert;
 using PdCore = PepperDash.Core.Abstractions;
 using PepperDash.Core.Logging;
 using Serilog;
diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/DisplayBaseMessenger.cs b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/DisplayBaseMessenger.cs
index 5ce9261e..1426dc25 100644
--- a/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/DisplayBaseMessenger.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/DeviceTypeExtensions/DisplayBaseMessenger.cs
@@ -3,6 +3,7 @@ using PepperDash.Core;
 using PepperDash.Core.Logging;
 using PepperDash.Essentials.AppServer;
 using PepperDash.Essentials.AppServer.Messengers;
+using PepperDash.Essentials.Core;
 using System.Linq;
 using DisplayBase = PepperDash.Essentials.Devices.Common.Displays.DisplayBase;
 
@@ -11,17 +12,17 @@ namespace PepperDash.Essentials.Room.MobileControl
     /// <summary>
     /// Represents a DisplayBaseMessenger
     /// </summary>
-    public class DisplayBaseMessenger : MessengerBase
+    public class IRoutingSinkWithSwitchingMessenger : MessengerBase
     {
-        private readonly DisplayBase display;
+        private readonly IRoutingSinkWithSwitching display;
 
         /// <summary>
-        /// Create an instance of the <see cref="DisplayBaseMessenger"/> class.
+        /// Create an instance of the <see cref="IRoutingSinkWithSwitchingMessenger"/> class.
         /// </summary>
         /// <param name="key"></param>
         /// <param name="messagePath"></param>
         /// <param name="device"></param>
-        public DisplayBaseMessenger(string key, string messagePath, DisplayBase device) : base(key, messagePath, device)
+        public IRoutingSinkWithSwitchingMessenger(string key, string messagePath, IRoutingSinkWithSwitching device) : base(key, messagePath, device)
         {
             display = device;
         }
diff --git a/src/PepperDash.Essentials.MobileControl/MessengerFactoryRegistry.cs b/src/PepperDash.Essentials.MobileControl/MessengerFactoryRegistry.cs
index e333cd0b..73e3dc22 100644
--- a/src/PepperDash.Essentials.MobileControl/MessengerFactoryRegistry.cs
+++ b/src/PepperDash.Essentials.MobileControl/MessengerFactoryRegistry.cs
@@ -87,7 +87,7 @@ namespace PepperDash.Essentials
                         $"{d.Key}-cameraBase-{ck}", (CameraBase)d, mp),
                     predicate: d => d is CameraBase && !(d is IHasCameraControls)
                 ),
-                
+
                 new MessengerFactoryEntry(
                     typeof(IHasCameraControls),
                     (d, mp, ck) => new CameraBaseMessenger<IHasCameraControls>(
@@ -116,9 +116,9 @@ namespace PepperDash.Essentials
 
                 // ── Displays ─────────────────────────────────────────────────────────────
                 new MessengerFactoryEntry(
-                    typeof(DisplayBase),
-                    (d, mp, ck) => new DisplayBaseMessenger(
-                        $"{d.Key}-displayBase-{ck}", mp, (DisplayBase)d)
+                    typeof(IRoutingSinkWithSwitching),
+                    (d, mp, ck) => new IRoutingSinkWithSwitchingMessenger(
+                        $"{d.Key}-displayBase-{ck}", mp, (IRoutingSinkWithSwitching)d)
                 ),
                 new MessengerFactoryEntry(
                     typeof(TwoWayDisplayBase),