diff --git a/src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs b/src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs
index cd3f6d37..e53ea7ec 100644
--- a/src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs
+++ b/src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs
@@ -2,10 +2,10 @@
 
 namespace PepperDash.Essentials.Core.Routing
 {
-    public interface IMatrixRouting
+    public interface IMatrixRouting<TInput, TOutput> where TInput : IRoutingInputSlot where TOutput : IRoutingOutputSlot
     {
-        Dictionary<string, RoutingInputSlotBase> InputSlots { get; }
-        Dictionary<string, RoutingOutputSlotBase> OutputSlots { get; }
+        Dictionary<string, TInput> InputSlots { get; }
+        Dictionary<string, TOutput> OutputSlots { get; }
 
         void Route(string inputSlotKey, string outputSlotKey, eRoutingSignalType type);
     }
diff --git a/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs b/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs
index dd036205..a1241821 100644
--- a/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs
+++ b/src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs
@@ -26,7 +26,6 @@ namespace PepperDash.Essentials.Devices.Common.Displays
             {
                 return () =>
                     {
-                        Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** Display Power is {0}", _PowerIsOn ? "on" : "off");
                         return _PowerIsOn;
                     };
         } }
@@ -36,7 +35,6 @@ namespace PepperDash.Essentials.Devices.Common.Displays
             {
                 return () =>
                 {
-                    Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** {0}", _IsCoolingDown ? "Display is cooling down" : "Display has finished cooling down");
                     return _IsCoolingDown;
                 };
             }
@@ -47,7 +45,6 @@ namespace PepperDash.Essentials.Devices.Common.Displays
             {
                 return () =>
                 {
-                    Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** {0}", _IsWarmingUp ? "Display is warming up" : "Display has finished warming up");
                     return _IsWarmingUp;
                 };
             }