diff --git a/include/evse_security/crypto/interface/crypto_types.hpp b/include/evse_security/crypto/interface/crypto_types.hpp
index 6e0305b..de90f99 100644
--- a/include/evse_security/crypto/interface/crypto_types.hpp
+++ b/include/evse_security/crypto/interface/crypto_types.hpp
@@ -15,7 +15,7 @@ enum class CryptoKeyType {
     EC_secp384r1,  // P-384, ~equiv to rsa 7680
     RSA_TPM20,     // Default TPM RSA, only option allowed for TPM (universal support), 2048 bits
     RSA_3072,      // Default RSA. Protection lifetime: ~2030
-    RSA_7680,      // Protection lifetime: >2031
+    RSA_7680,      // Protection lifetime: >2031. Very long generation time 8-40s on 16 core PC
 };
 
 enum class KeyValidationResult {
diff --git a/lib/evse_security/evse_security.cpp b/lib/evse_security/evse_security.cpp
index af4e034..2d8d46b 100644
--- a/lib/evse_security/evse_security.cpp
+++ b/lib/evse_security/evse_security.cpp
@@ -638,7 +638,7 @@ EvseSecurity::get_installed_certificates(const std::vector<CertificateType>& cer
                         certificate_chains.push_back(certificate_hash_data_chain);
                     }
                 }
-            } catch(const CertificateLoadException& e) {
+            } catch (const CertificateLoadException& e) {
                 EVLOG_error << "Could not load installed leaf certificates: " << e.what();
             }
         }
@@ -671,7 +671,7 @@ int EvseSecurity::get_count_of_installed_certificates(const std::vector<Certific
         try {
             X509CertificateBundle ca_bundle(unique_dir, EncodingFormat::PEM);
             count += ca_bundle.get_certificate_count();
-        } catch(const CertificateLoadException& e) {
+        } catch (const CertificateLoadException& e) {
             EVLOG_error << "Could not load bundle for certificate count: " << e.what();
         }
     }
@@ -685,7 +685,7 @@ int EvseSecurity::get_count_of_installed_certificates(const std::vector<Certific
         try {
             X509CertificateBundle leaf_bundle(leaf_dir, EncodingFormat::PEM);
             count += leaf_bundle.get_certificate_count();
-        } catch(const CertificateLoadException& e) {
+        } catch (const CertificateLoadException& e) {
             EVLOG_error << "Could not load bundle for certificate count: " << e.what();
         }
     }
diff --git a/tests/openssl_supplier_test.cpp b/tests/openssl_supplier_test.cpp
index bd3c537..69ed7c9 100644
--- a/tests/openssl_supplier_test.cpp
+++ b/tests/openssl_supplier_test.cpp
@@ -41,15 +41,6 @@ TEST_F(OpenSSLSupplierTest, generate_key_RSA_3072) {
     ASSERT_TRUE(res);
 }
 
-TEST_F(OpenSSLSupplierTest, generate_key_RSA_7680) {
-    KeyGenerationInfo info = {
-        CryptoKeyType::RSA_7680, false, std::nullopt, std::nullopt, std::nullopt,
-    };
-    KeyHandle_ptr key;
-    auto res = OpenSSLSupplier::generate_key(info, key);
-    ASSERT_TRUE(res);
-}
-
 TEST_F(OpenSSLSupplierTest, generate_key_EC_prime256v1) {
     KeyGenerationInfo info = {
         CryptoKeyType::EC_prime256v1, false, std::nullopt, std::nullopt, std::nullopt,
diff --git a/tests/openssl_supplier_test_tpm.cpp b/tests/openssl_supplier_test_tpm.cpp
index 15583ea..952044d 100644
--- a/tests/openssl_supplier_test_tpm.cpp
+++ b/tests/openssl_supplier_test_tpm.cpp
@@ -41,16 +41,6 @@ TEST_F(OpenSSLSupplierTpmTest, generate_key_RSA_3072) {
     ASSERT_TRUE(res);
 }
 
-TEST_F(OpenSSLSupplierTpmTest, generate_key_RSA_7680) {
-    KeyGenerationInfo info = {
-        CryptoKeyType::RSA_7680, true, std::nullopt, std::nullopt, std::nullopt,
-    };
-    KeyHandle_ptr key;
-    auto res = OpenSSLSupplier::generate_key(info, key);
-    // not commonly supported by TPMs
-    ASSERT_FALSE(res);
-}
-
 TEST_F(OpenSSLSupplierTpmTest, generate_key_EC_prime256v1) {
     KeyGenerationInfo info = {
         CryptoKeyType::EC_prime256v1, true, std::nullopt, std::nullopt, std::nullopt,