diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/AuthenticatorTransports.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/AuthenticatorTransports.cs
index 03491a02..232f1aef 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/AuthenticatorTransports.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/AuthenticatorTransports.cs
@@ -12,12 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Collections.Generic;
-using System.Formats.Cbor;
-using System.Globalization;
-using Yubico.YubiKey.Fido2.Cbor;
-
 namespace Yubico.YubiKey.Fido2
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/BioEnrollBeginResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/BioEnrollBeginResponse.cs
index 2dcd9fc1..cc140b67 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/BioEnrollBeginResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/BioEnrollBeginResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Fido2.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ConfigResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ConfigResponse.cs
index 3ef02123..36fa27c9 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ConfigResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ConfigResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Fido2.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnableEnterpriseAttestationCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnableEnterpriseAttestationCommand.cs
index 30e40da0..e3598789 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnableEnterpriseAttestationCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnableEnterpriseAttestationCommand.cs
@@ -14,7 +14,6 @@
 
 using System;
 using Yubico.Core.Iso7816;
-using Yubico.YubiKey.Fido2.Cbor;
 using Yubico.YubiKey.Fido2.PinProtocols;
 
 namespace Yubico.YubiKey.Fido2.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnumerateCredentialsGetNextResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnumerateCredentialsGetNextResponse.cs
index dc65924d..2200d478 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnumerateCredentialsGetNextResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnumerateCredentialsGetNextResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Fido2.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnumerateRpsGetNextResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnumerateRpsGetNextResponse.cs
index 847be0b1..6aaf9a0a 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnumerateRpsGetNextResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/EnumerateRpsGetNextResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Fido2.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetAssertionCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetAssertionCommand.cs
index 7820e4bb..89b3e79a 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetAssertionCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetAssertionCommand.cs
@@ -14,7 +14,6 @@
 
 using System;
 using Yubico.Core.Iso7816;
-using Yubico.YubiKey.Fido2.PinProtocols;
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetBioModalityResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetBioModalityResponse.cs
index d508e8f9..66e1c26e 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetBioModalityResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetBioModalityResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Fido2.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetFingerprintSensorInfoResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetFingerprintSensorInfoResponse.cs
index e2d8cbf4..ba2b5d40 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetFingerprintSensorInfoResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetFingerprintSensorInfoResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Fido2.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetNextAssertionCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetNextAssertionCommand.cs
index 3a72704c..b0aa4cc8 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetNextAssertionCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/GetNextAssertionCommand.cs
@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
-using Yubico.YubiKey.Fido2.PinProtocols;
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/MakeCredentialCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/MakeCredentialCommand.cs
index fa7f5949..1771451b 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/MakeCredentialCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/MakeCredentialCommand.cs
@@ -14,7 +14,6 @@
 
 using System;
 using Yubico.Core.Iso7816;
-using Yubico.YubiKey.Fido2.PinProtocols;
 
 namespace Yubico.YubiKey.Fido2.Commands
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/RequirementValue.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/RequirementValue.cs
index 534b20d7..83c5eb9d 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/RequirementValue.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/RequirementValue.cs
@@ -12,14 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Collections.Generic;
-using System.Formats.Cbor;
-using System.Globalization;
-using Yubico.YubiKey.Fido2.Cbor;
-using Yubico.YubiKey.Fido2.Cose;
-using Yubico.YubiKey.Fido2.PinProtocols;
-
 namespace Yubico.YubiKey.Fido2
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ResetResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ResetResponse.cs
index ca0aecb3..84b82f8f 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ResetResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ResetResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Fido2.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/SetLargeBlobResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/SetLargeBlobResponse.cs
index 7eceb2f9..9ef8b441 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/SetLargeBlobResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/SetLargeBlobResponse.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Globalization;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Fido2.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ToggleAlwaysUvCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ToggleAlwaysUvCommand.cs
index 9c5acb6f..6cccbde1 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ToggleAlwaysUvCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Commands/ToggleAlwaysUvCommand.cs
@@ -14,7 +14,6 @@
 
 using System;
 using Yubico.Core.Iso7816;
-using Yubico.YubiKey.Fido2.Cbor;
 using Yubico.YubiKey.Fido2.PinProtocols;
 
 namespace Yubico.YubiKey.Fido2.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Cose/CoseKey.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Cose/CoseKey.cs
index 82a7e7df..f2363184 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Cose/CoseKey.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Cose/CoseKey.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Formats.Cbor;
 using System.Globalization;
 using Yubico.YubiKey.Fido2.Cbor;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/CredentialId.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/CredentialId.cs
index 01a6f466..c34bd408 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/CredentialId.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/CredentialId.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Collections.Generic;
 using System.Formats.Cbor;
-using System.Globalization;
 using Yubico.YubiKey.Fido2.Cbor;
 
 namespace Yubico.YubiKey.Fido2
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Fido2Session.BioEnrollment.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Fido2Session.BioEnrollment.cs
index 01bbfff8..f239e920 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Fido2Session.BioEnrollment.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Fido2Session.BioEnrollment.cs
@@ -15,8 +15,6 @@
 using System;
 using System.Collections.Generic;
 using System.Security;
-using System.Threading;
-using System.Threading.Tasks;
 using Yubico.Core.Logging;
 using Yubico.YubiKey.Fido2.Commands;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Fido2Session.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Fido2Session.cs
index 6c9657dd..90d48227 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Fido2Session.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/Fido2Session.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Threading;
 using Yubico.Core.Logging;
 using Yubico.YubiKey.Fido2.Commands;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/GetAssertionParameters.Extensions.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/GetAssertionParameters.Extensions.cs
index 9014d1d0..bc8c36da 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/GetAssertionParameters.Extensions.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/GetAssertionParameters.Extensions.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using Yubico.YubiKey.Fido2.Cbor;
 using Yubico.YubiKey.Fido2.PinProtocols;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/OptionValue.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/OptionValue.cs
index 961e32c1..7e799335 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/OptionValue.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/OptionValue.cs
@@ -12,14 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Collections.Generic;
-using System.Formats.Cbor;
-using System.Globalization;
-using Yubico.YubiKey.Fido2.Cbor;
-using Yubico.YubiKey.Fido2.Cose;
-using Yubico.YubiKey.Fido2.PinProtocols;
-
 namespace Yubico.YubiKey.Fido2
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/ParameterHelpers.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/ParameterHelpers.cs
index 9e9382ac..1f771c61 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/ParameterHelpers.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/ParameterHelpers.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Collections.Generic;
 using System.Formats.Cbor;
-using System.Globalization;
 using Yubico.YubiKey.Fido2.Cose;
 
 namespace Yubico.YubiKey.Fido2
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/PinProtocols/PinUvAuthProtocolOne.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/PinProtocols/PinUvAuthProtocolOne.cs
index 74d945ca..409b46cf 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/PinProtocols/PinUvAuthProtocolOne.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/PinProtocols/PinUvAuthProtocolOne.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Globalization;
-using System.IO;
 using System.Security.Cryptography;
 using Yubico.YubiKey.Cryptography;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/PinProtocols/PinUvAuthProtocolTwo.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/PinProtocols/PinUvAuthProtocolTwo.cs
index f69c5e76..f73d307c 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/PinProtocols/PinUvAuthProtocolTwo.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/PinProtocols/PinUvAuthProtocolTwo.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Globalization;
-using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 using Yubico.YubiKey.Cryptography;
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/SerializedLargeBlobArray.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/SerializedLargeBlobArray.cs
index df5998c2..b91bd025 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/SerializedLargeBlobArray.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/SerializedLargeBlobArray.cs
@@ -19,7 +19,6 @@
 using System.Security.Cryptography;
 using Yubico.Core.Logging;
 using Yubico.YubiKey.Cryptography;
-using Yubico.YubiKey.Fido2.Cbor;
 
 namespace Yubico.YubiKey.Fido2
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/UserEntity.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/UserEntity.cs
index 3e4c39f1..3ee623cf 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/UserEntity.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Fido2/UserEntity.cs
@@ -13,9 +13,7 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using System.Formats.Cbor;
-using System.Globalization;
 using Yubico.YubiKey.Fido2.Cbor;
 
 namespace Yubico.YubiKey.Fido2
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/ICancelApduTransform.cs b/Yubico.YubiKey/src/Yubico/YubiKey/ICancelApduTransform.cs
index 28c2f183..2e320574 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/ICancelApduTransform.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/ICancelApduTransform.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-
 namespace Yubico.YubiKey
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/ICancelConnection.cs b/Yubico.YubiKey/src/Yubico/YubiKey/ICancelConnection.cs
index b4b16fa6..213dda9e 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/ICancelConnection.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/ICancelConnection.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-
 namespace Yubico.YubiKey
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/ImageProcessorVersion.cs b/Yubico.YubiKey/src/Yubico/YubiKey/ImageProcessorVersion.cs
index 5146443c..c50c5e6a 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/ImageProcessorVersion.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/ImageProcessorVersion.cs
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Diagnostics.CodeAnalysis;
-
 namespace Yubico.YubiKey
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/BaseSelectApplicationCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/BaseSelectApplicationCommand.cs
index f0411fc5..8ea3db27 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/BaseSelectApplicationCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/BaseSelectApplicationCommand.cs
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.InterIndustry.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/GenericSelectApplicationData.cs b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/GenericSelectApplicationData.cs
index e6f00cb4..d48afa93 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/GenericSelectApplicationData.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/GenericSelectApplicationData.cs
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Yubico.YubiKey.InterIndustry.Commands
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/GenericSelectResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/GenericSelectResponse.cs
index 31c637a3..1550be1f 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/GenericSelectResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/GenericSelectResponse.cs
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.InterIndustry.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationCommand.cs
index 8d39604f..cf9dcf1a 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationCommand.cs
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Yubico.YubiKey.InterIndustry.Commands
 {
     public interface ISelectApplicationCommand<TSelectResponse> : IYubiKeyCommand<TSelectResponse>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationData.cs b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationData.cs
index 185c6c9b..b92d98db 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationData.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationData.cs
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Yubico.YubiKey.InterIndustry.Commands
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationResponse.cs
index 9859d681..bdb10809 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/ISelectApplicationResponse.cs
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Yubico.YubiKey.InterIndustry.Commands
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/SelectApplicationCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/SelectApplicationCommand.cs
index f7465e12..029821e7 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/SelectApplicationCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/InterIndustry/Commands/SelectApplicationCommand.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.InterIndustry.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/KeyboardReport.cs b/Yubico.YubiKey/src/Yubico/YubiKey/KeyboardReport.cs
index ef7992dd..f832cea6 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/KeyboardReport.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/KeyboardReport.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
 
 namespace Yubico.YubiKey
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Management/Commands/DeviceResetCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Management/Commands/DeviceResetCommand.cs
index dba570cd..72e55804 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Management/Commands/DeviceResetCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Management/Commands/DeviceResetCommand.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Management.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Management/Commands/DeviceResetResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Management/Commands/DeviceResetResponse.cs
index 0fb207c8..83212af4 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Management/Commands/DeviceResetResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Management/Commands/DeviceResetResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Management.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Oath/Commands/CalculateAllCredentialsCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Oath/Commands/CalculateAllCredentialsCommand.cs
index af5e458b..1ab4ad6c 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Oath/Commands/CalculateAllCredentialsCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Oath/Commands/CalculateAllCredentialsCommand.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 using Yubico.Core.Tlv;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Oath/Commands/OathChallengeResponseBaseCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Oath/Commands/OathChallengeResponseBaseCommand.cs
index 27d67609..7e3a19b5 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Oath/Commands/OathChallengeResponseBaseCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Oath/Commands/OathChallengeResponseBaseCommand.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Buffers.Binary;
-using System.Linq;
 using System.Security.Cryptography;
 using Yubico.YubiKey.Cryptography;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Oath/CredentialType.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Oath/CredentialType.cs
index 78c134fc..6585fca6 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Oath/CredentialType.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Oath/CredentialType.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-
 namespace Yubico.YubiKey.Oath
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Oath/OathSession.Credential.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Oath/OathSession.Credential.cs
index 78731677..989400f6 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Oath/OathSession.Credential.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Oath/OathSession.Credential.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Security;
 using Yubico.YubiKey.Oath.Commands;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Pipelines/FidoTransform.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Pipelines/FidoTransform.cs
index 901b9e84..f586a606 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Pipelines/FidoTransform.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Pipelines/FidoTransform.cs
@@ -18,7 +18,6 @@
 using System.Security.Cryptography;
 using Yubico.Core.Devices.Hid;
 using Yubico.Core.Iso7816;
-using Yubico.YubiKey.Fido2;
 using Yubico.YubiKey.Fido2.Commands;
 
 namespace Yubico.YubiKey.Pipelines
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/AuthenticateKeyAgreeCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/AuthenticateKeyAgreeCommand.cs
index f08d1881..90582675 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/AuthenticateKeyAgreeCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/AuthenticateKeyAgreeCommand.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using Yubico.Core.Iso7816;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/ChangeReferenceDataCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/ChangeReferenceDataCommand.cs
index f371c294..291ef5e9 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/ChangeReferenceDataCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/ChangeReferenceDataCommand.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using Yubico.Core.Iso7816;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/GetBioMetadataCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/GetBioMetadataCommand.cs
index 0a663435..f8d365dd 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/GetBioMetadataCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/GetBioMetadataCommand.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Globalization;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Piv.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/GetSerialNumberResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/GetSerialNumberResponse.cs
index 163a737a..a5d07ea4 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/GetSerialNumberResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/GetSerialNumberResponse.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Buffers.Binary;
-using System.Linq;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Piv.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/ISymmetricForManagementKey.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/ISymmetricForManagementKey.cs
index b8a3dbd5..18f507e3 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/ISymmetricForManagementKey.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/ISymmetricForManagementKey.cs
@@ -13,9 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Globalization;
-using System.Security.Cryptography;
-using Yubico.YubiKey.Cryptography;
 
 namespace Yubico.YubiKey.Piv.Commands
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/InitializeAuthenticateManagementKeyCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/InitializeAuthenticateManagementKeyCommand.cs
index a1164d87..66d0ec64 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/InitializeAuthenticateManagementKeyCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/InitializeAuthenticateManagementKeyCommand.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Collections.Generic;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Piv.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/PivResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/PivResponse.cs
index 0bb62d2e..b3fa3171 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/PivResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/PivResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Piv.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/SetManagementKeyResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/SetManagementKeyResponse.cs
index 479e3513..56d95055 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/SetManagementKeyResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/SetManagementKeyResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Piv.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyPinCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyPinCommand.cs
index a6c28d0e..f5c7da5a 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyPinCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyPinCommand.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using Yubico.Core.Iso7816;
 
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyTemporaryPinCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyTemporaryPinCommand.cs
index 5bb7b23c..44a4b83d 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyTemporaryPinCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyTemporaryPinCommand.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using Yubico.Core.Iso7816;
 using Yubico.Core.Tlv;
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyTemporaryPinResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyTemporaryPinResponse.cs
index b931854b..aaab702b 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyTemporaryPinResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyTemporaryPinResponse.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Globalization;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.Piv.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyUvCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyUvCommand.cs
index 797ae421..6aa51ecf 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyUvCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/Commands/VerifyUvCommand.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using Yubico.Core.Iso7816;
 using Yubico.Core.Tlv;
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivBioMetadata.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivBioMetadata.cs
index 6a0d9bbd..27db58fd 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivBioMetadata.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivBioMetadata.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Diagnostics;
 using System.Globalization;
 using Yubico.Core.Tlv;
 using Yubico.YubiKey.Piv.Commands;
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivPinPolicy.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivPinPolicy.cs
index 8742133a..4eabffc1 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivPinPolicy.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivPinPolicy.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-
 namespace Yubico.YubiKey.Piv
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivTouchPolicy.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivTouchPolicy.cs
index c1625a28..7ce76094 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivTouchPolicy.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Piv/PivTouchPolicy.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-
 namespace Yubico.YubiKey.Piv
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Commands/DeleteKeyCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Commands/DeleteKeyCommand.cs
index 7edba046..4aca9fda 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Commands/DeleteKeyCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Commands/DeleteKeyCommand.cs
@@ -13,9 +13,7 @@
 // limitations under the License.
 
 using System;
-using System.Security.Cryptography;
 using Yubico.Core.Iso7816;
-using Yubico.YubiKey.Cryptography;
 
 namespace Yubico.YubiKey.Scp03.Commands
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Derivation.cs b/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Derivation.cs
index d14cda86..2e697a26 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Derivation.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/Scp03/Derivation.cs
@@ -15,7 +15,6 @@
 using System;
 using System.Security.Cryptography;
 using Yubico.Core.Cryptography;
-using Yubico.PlatformInterop;
 using Yubico.YubiKey.Cryptography;
 
 namespace Yubico.YubiKey.Scp03
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/TemplateStorageVersion.cs b/Yubico.YubiKey/src/Yubico/YubiKey/TemplateStorageVersion.cs
index e10be997..f5299cf7 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/TemplateStorageVersion.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/TemplateStorageVersion.cs
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Diagnostics.CodeAnalysis;
-
 namespace Yubico.YubiKey
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/AuthenticateCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/AuthenticateCommand.cs
index dcd408bc..360f1e5c 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/AuthenticateCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/AuthenticateCommand.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Globalization;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.U2f.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/AuthenticateResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/AuthenticateResponse.cs
index afe9f56a..f396df66 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/AuthenticateResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/AuthenticateResponse.cs
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.U2f.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/RegisterCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/RegisterCommand.cs
index c18aadf7..e16ed5bd 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/RegisterCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/RegisterCommand.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Globalization;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.U2f.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/ResetResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/ResetResponse.cs
index 2f6ce87e..6e38c9ac 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/ResetResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/ResetResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.U2f.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/SetPinCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/SetPinCommand.cs
index a7399399..07fadda2 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/SetPinCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/SetPinCommand.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Globalization;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.U2f.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/SetPinResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/SetPinResponse.cs
index d1719b13..6dda1785 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/SetPinResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/SetPinResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.U2f.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/VerifyPinCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/VerifyPinCommand.cs
index ea7758c5..486d9777 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/VerifyPinCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/VerifyPinCommand.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Globalization;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.U2f.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/VerifyPinResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/VerifyPinResponse.cs
index f8b8b739..3d7c3bad 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/VerifyPinResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/Commands/VerifyPinResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.U2f.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/U2fBuffer.cs b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/U2fBuffer.cs
index 0e8bd87c..8a751366 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/U2fBuffer.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/U2fBuffer.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Globalization;
-using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.U2f
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/U2fSignedData.cs b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/U2fSignedData.cs
index 1b43b5ce..e625fee9 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/U2f/U2fSignedData.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/U2f/U2fSignedData.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using Yubico.Core.Tlv;
 using Yubico.YubiKey.Cryptography;
 
 namespace Yubico.YubiKey.U2f
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Aes128CredentialWithSecrets.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Aes128CredentialWithSecrets.cs
index 1936e867..e6e78f80 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Aes128CredentialWithSecrets.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Aes128CredentialWithSecrets.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Globalization;
-using Yubico.Core.Tlv;
 
 namespace Yubico.YubiKey.YubiHsmAuth
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/ApplicationVersion.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/ApplicationVersion.cs
index 70691d3e..ec0c9591 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/ApplicationVersion.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/ApplicationVersion.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-
 namespace Yubico.YubiKey.YubiHsmAuth
 {
     /// <summary>
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/BaseYubiHsmAuthResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/BaseYubiHsmAuthResponse.cs
index 7b0d4a9c..c9373519 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/BaseYubiHsmAuthResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/BaseYubiHsmAuthResponse.cs
@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.YubiHsmAuth.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ChangeManagementKeyResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ChangeManagementKeyResponse.cs
index 4f9265ea..298dd223 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ChangeManagementKeyResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ChangeManagementKeyResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.YubiHsmAuth.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetAes128SessionKeysCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetAes128SessionKeysCommand.cs
index 6a4b5b7b..05f7b035 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetAes128SessionKeysCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetAes128SessionKeysCommand.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Globalization;
-using System.Runtime.CompilerServices;
 using System.Text;
 using Yubico.Core.Iso7816;
 using Yubico.Core.Tlv;
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetAes128SessionKeysResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetAes128SessionKeysResponse.cs
index 25939bc9..f8d2bf32 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetAes128SessionKeysResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetAes128SessionKeysResponse.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.YubiHsmAuth.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetApplicationVersionCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetApplicationVersionCommand.cs
index 6550995a..0fef0154 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetApplicationVersionCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetApplicationVersionCommand.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.YubiHsmAuth.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetManagementKeyRetriesCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetManagementKeyRetriesCommand.cs
index f6084cc1..8acb1b29 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetManagementKeyRetriesCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/GetManagementKeyRetriesCommand.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.YubiHsmAuth.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ListCredentialsCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ListCredentialsCommand.cs
index 05365bcb..50ff6c8d 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ListCredentialsCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ListCredentialsCommand.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.YubiHsmAuth.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ResetApplicationCommand.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ResetApplicationCommand.cs
index 8166f818..dc93d41c 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ResetApplicationCommand.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ResetApplicationCommand.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.YubiHsmAuth.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ResetApplicationResponse.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ResetApplicationResponse.cs
index 7c8f03b7..49df1552 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ResetApplicationResponse.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Commands/ResetApplicationResponse.cs
@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
 using Yubico.Core.Iso7816;
 
 namespace Yubico.YubiKey.YubiHsmAuth.Commands
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Credential.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Credential.cs
index 9340734b..0e8faaeb 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Credential.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/Credential.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Globalization;
-using System.Linq.Expressions;
 using System.Text;
 
 namespace Yubico.YubiKey.YubiHsmAuth
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/CredentialRetryPair.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/CredentialRetryPair.cs
index fbf53b2d..2341ff45 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/CredentialRetryPair.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/CredentialRetryPair.cs
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 
 namespace Yubico.YubiKey.YubiHsmAuth
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/CredentialWithSecrets.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/CredentialWithSecrets.cs
index 422044c5..4a116a0a 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/CredentialWithSecrets.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiHsmAuth/CredentialWithSecrets.cs
@@ -13,9 +13,7 @@
 // limitations under the License.
 
 using System;
-using System.ComponentModel;
 using System.Globalization;
-using Yubico.Core.Tlv;
 
 namespace Yubico.YubiKey.YubiHsmAuth
 {
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiKeyCapabilitiesExtensions.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiKeyCapabilitiesExtensions.cs
index 2cbb029a..eb352d33 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiKeyCapabilitiesExtensions.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiKeyCapabilitiesExtensions.cs
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using System;
-
 namespace Yubico.YubiKey
 {
     internal static class YubiKeyCapabilitiesExtensions
diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/YubiKeyDeviceListener.cs b/Yubico.YubiKey/src/Yubico/YubiKey/YubiKeyDeviceListener.cs
index 33329de0..96e2a338 100644
--- a/Yubico.YubiKey/src/Yubico/YubiKey/YubiKeyDeviceListener.cs
+++ b/Yubico.YubiKey/src/Yubico/YubiKey/YubiKeyDeviceListener.cs
@@ -14,7 +14,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading;
 using Yubico.Core.Devices;