diff --git a/src/PepperDash.Essentials.Core/Routing/Extensions.cs b/src/PepperDash.Essentials.Core/Routing/Extensions.cs
index 4346f3a9..5d09176f 100644
--- a/src/PepperDash.Essentials.Core/Routing/Extensions.cs
+++ b/src/PepperDash.Essentials.Core/Routing/Extensions.cs
@@ -134,7 +134,7 @@ namespace PepperDash.Essentials.Core
             }
             // otherwise, audioVideo needs to be handled as two steps.
 
-            Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {sourceKey} of type {type}", destination, source.Key, signalType);
+            Debug.LogMessage(LogEventLevel.Debug, "Attempting to build source route from {destinationKey} to {sourceKey} of type {type}", destination, source.Key, signalType);
 
             RouteDescriptor audioRouteDescriptor;
 
diff --git a/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs b/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs
index 7e933b51..64617770 100644
--- a/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs
+++ b/src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs
@@ -76,24 +76,8 @@ namespace PepperDash.Essentials.Devices.Common.Generic
 
         private void UpdateCurrentSources(eRoutingSignalType signalType, string sourceListKey, SourceListItem sourceListItem)
         {
-            if (CurrentSources.ContainsKey(signalType))
-            {
-                CurrentSources[signalType] = sourceListItem;
-            }
-            else
-            {
-                CurrentSources.Add(signalType, sourceListItem);
-            }
-
-            // Update the current source key for the specified signal type
-            if (CurrentSourceKeys.ContainsKey(signalType))
-            {
-                CurrentSourceKeys[signalType] = sourceListKey;
-            }
-            else
-            {
-                CurrentSourceKeys.Add(signalType, sourceListKey);
-            }
+            CurrentSources[signalType] = sourceListItem;
+            CurrentSourceKeys[signalType] = sourceListKey;
         }
 
         /// <summary>