diff --git a/src/NvxEpi/Devices/Nvx35x.cs b/src/NvxEpi/Devices/Nvx35x.cs
index b78db54..32abdcd 100644
--- a/src/NvxEpi/Devices/Nvx35x.cs
+++ b/src/NvxEpi/Devices/Nvx35x.cs
@@ -236,6 +236,6 @@ public StringFeedback UsbLocalId
 
         public ReadOnlyDictionary<uint, StringFeedback> HdcpCapabilityString { get { return _hdmiInputs.HdcpCapabilityString; } }
 
-        public ReadOnlyDictionary<uint, StringFeedback> HdcpSupport => _hdmiInputs.HdcpSupport;
+        public ReadOnlyDictionary<uint, StringFeedback> HdcpSupport { get { return _hdmiInputs.HdcpSupport; } }
     }
 }
\ No newline at end of file
diff --git a/src/NvxEpi/Devices/Nvx36X.cs b/src/NvxEpi/Devices/Nvx36X.cs
index a4b8406..bc8cc3b 100644
--- a/src/NvxEpi/Devices/Nvx36X.cs
+++ b/src/NvxEpi/Devices/Nvx36X.cs
@@ -286,6 +286,6 @@ public BoolFeedback MuteFeedback
 
         public ReadOnlyDictionary<uint, StringFeedback> HdcpCapabilityString { get { return _hdmiInputs.HdcpCapabilityString; } }
 
-        public ReadOnlyDictionary<uint, StringFeedback> HdcpSupport => _hdmiInputs.HdcpSupport;
+        public ReadOnlyDictionary<uint, StringFeedback> HdcpSupport { get { return _hdmiInputs.HdcpSupport; } }
     }
 }
\ No newline at end of file
diff --git a/src/NvxEpi/Devices/NvxE3X.cs b/src/NvxEpi/Devices/NvxE3X.cs
index 51426ff..b3737a0 100644
--- a/src/NvxEpi/Devices/NvxE3X.cs
+++ b/src/NvxEpi/Devices/NvxE3X.cs
@@ -120,7 +120,7 @@ public ReadOnlyDictionary<uint, StringFeedback> HdrType {
 
         public ReadOnlyDictionary<uint, StringFeedback> HdcpCapabilityString { get { return _hdmiInputs.HdcpCapabilityString; } }
 
-        public ReadOnlyDictionary<uint, StringFeedback> HdcpSupport => _hdmiInputs.HdcpSupport;
+        public ReadOnlyDictionary<uint, StringFeedback> HdcpSupport { get { return _hdmiInputs.HdcpSupport; } }
 
         public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
         {
diff --git a/src/NvxEpi/Features/Hdmi/Input/HdmiInputBase.cs b/src/NvxEpi/Features/Hdmi/Input/HdmiInputBase.cs
index b945be9..7d28a0d 100644
--- a/src/NvxEpi/Features/Hdmi/Input/HdmiInputBase.cs
+++ b/src/NvxEpi/Features/Hdmi/Input/HdmiInputBase.cs
@@ -3,7 +3,6 @@
 using Crestron.SimplSharpPro.DM.Streaming;
 using NvxEpi.Abstractions;
 using NvxEpi.Abstractions.HdmiInput;
-using Org.BouncyCastle.Asn1.X509;
 using PepperDash.Essentials.Core;
 
 namespace NvxEpi.Features.Hdmi.Input
diff --git a/src/NvxEpi/NvxEpi.csproj b/src/NvxEpi/NvxEpi.csproj
index 413378b..91e0942 100644
--- a/src/NvxEpi/NvxEpi.csproj
+++ b/src/NvxEpi/NvxEpi.csproj
@@ -133,9 +133,8 @@
     <Compile Include="Features\AutomaticRouting\AutomaticInputRouter.cs" />
     <Compile Include="Features\Config\NvxDirectorConfig.cs" />
     <Compile Include="Factories\NvxDirectorFactory.cs" />
-    <Compile Include="Features\Hdmi\Input\HdmiInput2.cs" />
+    <Compile Include="Features\Hdmi\Input\HdmiInput.cs" />
     <Compile Include="Features\Hdmi\Input\HdmiInputBase.cs" />
-    <Compile Include="Features\Hdmi\Input\HdmiInput1.cs" />
     <Compile Include="Features\Hdmi\Output\HdmiOutput.cs" />
     <Compile Include="Features\Hdmi\Output\VideowallModeOutput.cs" />
     <Compile Include="Features\InputSwitching\NaxInputSwitcher.cs" />
@@ -184,6 +183,7 @@
     <Compile Include="Services\Feedback\DmHdcpCapabilityValueFeedback.cs" />
     <Compile Include="Services\Feedback\DmSyncDetectedFeedback.cs" />
     <Compile Include="Services\Feedback\HdmiInputFeedbacks.cs" />
+    <Compile Include="Services\Feedback\HdmiOutputResolutionFeedback.cs" />
     <Compile Include="Services\Feedback\NaxInputValueFeedback.cs" />
     <Compile Include="Services\Feedback\DanteInputFeedback.cs" />
     <Compile Include="Services\Feedback\DanteInputValueFeedback.cs" />
diff --git a/src/NvxEpi/Services/Feedback/HdmiOutputResolutionFeedback.cs b/src/NvxEpi/Services/Feedback/HdmiOutputResolutionFeedback.cs
index f42f6b9..e23f0a7 100644
--- a/src/NvxEpi/Services/Feedback/HdmiOutputResolutionFeedback.cs
+++ b/src/NvxEpi/Services/Feedback/HdmiOutputResolutionFeedback.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace NvxEpi.Services.Feedback
 {