diff --git a/src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs b/src/PepperDash.Essentials.Core/Routing/IMatrixRouting.cs
index 7bdd7453..d7dc8c79 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<TInput, TOutput> where TInput : IRoutingInputSlot where TOutput : IRoutingOutputSlot<TInput>
+    public interface IMatrixRouting
     {
-        Dictionary<string, TInput> InputSlots { get; }
-        Dictionary<string, TOutput> OutputSlots { get; }
+        Dictionary<string, IRoutingInputSlot> InputSlots { get; }
+        Dictionary<string, IRoutingOutputSlot> OutputSlots { get; }
 
         void Route(string inputSlotKey, string outputSlotKey, eRoutingSignalType type);
     }
diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingInputSlot.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingInputSlot.cs
index c9d6ee5e..faee0fe9 100644
--- a/src/PepperDash.Essentials.Core/Routing/IRoutingInputSlot.cs
+++ b/src/PepperDash.Essentials.Core/Routing/IRoutingInputSlot.cs
@@ -1,26 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core.Routing
+namespace PepperDash.Essentials.Core.Routing
 {
     public interface IRoutingInputSlot: IRoutingSlot, IOnline, IVideoSync
     {
         string TxDeviceKey { get; }
     }
-
-    public abstract class RoutingInputSlotBase : IRoutingInputSlot
-    {
-        public abstract string TxDeviceKey { get; }
-        public abstract int SlotNumber { get; }
-        public abstract eRoutingSignalType SupportedSignalTypes { get; }
-        public abstract string Name { get; }
-        public abstract BoolFeedback IsOnline { get; }
-        public abstract bool VideoSyncDetected { get; }
-        public abstract string Key { get; }
-
-        public abstract event EventHandler VideoSyncChanged;
-    }
 }
diff --git a/src/PepperDash.Essentials.Core/Routing/IRoutingOutputSlot.cs b/src/PepperDash.Essentials.Core/Routing/IRoutingOutputSlot.cs
index f8dff8be..478961cc 100644
--- a/src/PepperDash.Essentials.Core/Routing/IRoutingOutputSlot.cs
+++ b/src/PepperDash.Essentials.Core/Routing/IRoutingOutputSlot.cs
@@ -3,24 +3,12 @@ using System.Collections.Generic;
 
 namespace PepperDash.Essentials.Core.Routing
 {
-    public interface IRoutingOutputSlot<TInput> : IRoutingSlot where TInput: IRoutingInputSlot
+    public interface IRoutingOutputSlot : IRoutingSlot
     {
         event EventHandler OutputSlotChanged;
 
         string RxDeviceKey { get; }
 
-        Dictionary<eRoutingSignalType, TInput> CurrentRoutes { get; }
-    }
-
-    public abstract class RoutingOutputSlotBase<TInput> : IRoutingOutputSlot<TInput> where TInput: IRoutingInputSlot
-    {
-        public abstract string RxDeviceKey { get; }
-        public abstract Dictionary<eRoutingSignalType, TInput> CurrentRoutes { get; }
-        public abstract int SlotNumber { get; }
-        public abstract eRoutingSignalType SupportedSignalTypes { get; }
-        public abstract string Name { get; }
-        public abstract string Key { get; }
-
-        public abstract event EventHandler OutputSlotChanged;
-    }
+        Dictionary<eRoutingSignalType, IRoutingInputSlot> CurrentRoutes { get; }
+    }    
 }