diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj
index c403d1c3..5b500425 100644
--- a/PepperDashEssentials/PepperDashEssentials.csproj
+++ b/PepperDashEssentials/PepperDashEssentials.csproj
@@ -125,7 +125,6 @@
     <Compile Include="AppServer\SIMPLJoinMaps\MobileControlSIMPLRoomJoinMap.cs" />
     <Compile Include="Audio\EssentialsVolumeLevelConfig.cs" />
     <Compile Include="Bridges\BridgeFactory.cs" />
-    <Compile Include="Bridges\IBridge.cs" />
     <Compile Include="Factory\DeviceFactory.cs" />
     <Compile Include="Devices\Amplifier.cs" />
     <Compile Include="ControlSystem.cs" />
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs
index dc6f0170..e7e664be 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs	
@@ -119,11 +119,10 @@ namespace PepperDash.Essentials.Core.Bridges
                         continue;
                     }
 
-                    if (device.GetType().GetCType().IsAssignableFrom(typeof (IBridgeAdvanced)))
-                    {
-                        var bridge = device as IBridgeAdvanced;
-                        if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
-                    }
+                    if (!device.GetType().GetCType().IsAssignableFrom(typeof (IBridgeAdvanced))) continue;
+
+                    var bridgeAdvanced = device as IBridgeAdvanced;
+                    if (bridgeAdvanced != null) bridgeAdvanced.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
 
                     //if (device is IBridge)      // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type.
                     //{