diff --git a/pico-keys-sdk b/pico-keys-sdk
index 53d3a7a..09ec076 160000
--- a/pico-keys-sdk
+++ b/pico-keys-sdk
@@ -1 +1 @@
-Subproject commit 53d3a7ac91fdb0019ba5ec086c0b5197a811eb07
+Subproject commit 09ec0767b6a3bd79b2a176fb468e97d9fde28449
diff --git a/src/fido/cbor.c b/src/fido/cbor.c
index fec4d2f..772ec50 100644
--- a/src/fido/cbor.c
+++ b/src/fido/cbor.c
@@ -151,8 +151,7 @@ int cbor_process(uint8_t last_cmd, const uint8_t *data, size_t len) {
 CborError COSE_key_params(int crv, int alg, mbedtls_ecp_group *grp, mbedtls_ecp_point *Q, CborEncoder *mapEncoderParent, CborEncoder *mapEncoder) {
     CborError error = CborNoError;
     int kty = 1;
-    if (crv == FIDO2_CURVE_P256 || crv == FIDO2_CURVE_P384 || crv == FIDO2_CURVE_P521 ||
-        crv == FIDO2_CURVE_P256K1) {
+    if (crv == FIDO2_CURVE_P256) {
         kty = 2;
     }
 
@@ -197,26 +196,6 @@ CborError COSE_key(mbedtls_ecp_keypair *key, CborEncoder *mapEncoderParent,
     if (key->grp.id == MBEDTLS_ECP_DP_SECP256R1) {
         alg = FIDO2_ALG_ES256;
     }
-    else if (key->grp.id == MBEDTLS_ECP_DP_SECP384R1) {
-        alg = FIDO2_ALG_ES384;
-    }
-    else if (key->grp.id == MBEDTLS_ECP_DP_SECP521R1) {
-        alg = FIDO2_ALG_ES512;
-    }
-    else if (key->grp.id == MBEDTLS_ECP_DP_SECP256K1) {
-        alg = FIDO2_ALG_ES256K;
-    }
-    else if (key->grp.id == MBEDTLS_ECP_DP_CURVE25519) {
-        alg = FIDO2_ALG_ECDH_ES_HKDF_256;
-    }
-#ifdef MBEDTLS_EDDSA_C
-    else if (key->grp.id == MBEDTLS_ECP_DP_ED25519) {
-        alg = FIDO2_ALG_EDDSA;
-    }
-    else if (key->grp.id == MBEDTLS_ECP_DP_ED448) {
-        alg = FIDO2_ALG_ED448;
-    }
-#endif
     return COSE_key_params(crv, alg, &key->grp, &key->Q, mapEncoderParent, mapEncoder);
 }
 CborError COSE_key_shared(mbedtls_ecdh_context *key,
diff --git a/src/fido/cbor_get_assertion.c b/src/fido/cbor_get_assertion.c
index ee25e79..37264e8 100644
--- a/src/fido/cbor_get_assertion.c
+++ b/src/fido/cbor_get_assertion.c
@@ -633,20 +633,10 @@ int cbor_get_assertion(const uint8_t *data, size_t len, bool next) {
         else if (ekey.grp.id == MBEDTLS_ECP_DP_SECP521R1) {
             md = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
         }
-#ifdef MBEDTLS_EDDSA_C
-        else if (ekey.grp.id == MBEDTLS_ECP_DP_ED25519) {
-            md = NULL;
-        }
-#endif
         if (md != NULL) {
             ret = mbedtls_md(md, aut_data, aut_data_len + clientDataHash.len, hash);
             ret = mbedtls_ecdsa_write_signature(&ekey, mbedtls_md_get_type(md), hash, mbedtls_md_get_size(md), sig, sizeof(sig), &olen, random_gen, NULL);
         }
-#ifdef MBEDTLS_EDDSA_C
-        else {
-            ret = mbedtls_eddsa_write_signature(&ekey, aut_data, aut_data_len + clientDataHash.len, sig, sizeof(sig), &olen, MBEDTLS_EDDSA_PURE, NULL, 0, random_gen, NULL);
-        }
-#endif
     }
     else {
         // Bogus signature
diff --git a/src/fido/cbor_get_info.c b/src/fido/cbor_get_info.c
index 182e33a..25c8d4d 100644
--- a/src/fido/cbor_get_info.c
+++ b/src/fido/cbor_get_info.c
@@ -113,31 +113,9 @@ int cbor_get_info() {
 
     CBOR_CHECK(cbor_encode_uint(&mapEncoder, 0x0A));
 
-    uint8_t curves = 3;
-#ifdef MBEDTLS_EDDSA_C
-    curves++;
-#endif
-#ifndef ENABLE_EMULATION
-    if (phy_data.enabled_curves & PHY_CURVE_SECP256K1) {
-#endif
-        curves++;
-#ifndef ENABLE_EMULATION
-    }
-#endif
+    uint8_t curves = 1;
     CBOR_CHECK(cbor_encoder_create_array(&mapEncoder, &arrayEncoder, curves));
     CBOR_CHECK(COSE_public_key(FIDO2_ALG_ES256, &arrayEncoder, &mapEncoder2));
-#ifdef MBEDTLS_EDDSA_C
-    CBOR_CHECK(COSE_public_key(FIDO2_ALG_EDDSA, &arrayEncoder, &mapEncoder2));
-#endif
-    CBOR_CHECK(COSE_public_key(FIDO2_ALG_ES384, &arrayEncoder, &mapEncoder2));
-    CBOR_CHECK(COSE_public_key(FIDO2_ALG_ES512, &arrayEncoder, &mapEncoder2));
-#ifndef ENABLE_EMULATION
-    if (phy_data.enabled_curves & PHY_CURVE_SECP256K1) {
-#endif
-        CBOR_CHECK(COSE_public_key(FIDO2_ALG_ES256K, &arrayEncoder, &mapEncoder2));
-#ifndef ENABLE_EMULATION
-    }
-#endif
 
     CBOR_CHECK(cbor_encoder_close_container(&mapEncoder, &arrayEncoder));
 
diff --git a/src/fido/cbor_make_credential.c b/src/fido/cbor_make_credential.c
index 25a5d41..01785f4 100644
--- a/src/fido/cbor_make_credential.c
+++ b/src/fido/cbor_make_credential.c
@@ -234,57 +234,11 @@ int cbor_make_credential(const uint8_t *data, size_t len) {
         if (strcmp(pubKeyCredParams[i].type.data, "public-key") != 0) {
             CBOR_ERROR(CTAP2_ERR_CBOR_UNEXPECTED_TYPE);
         }
-        if (pubKeyCredParams[i].alg == FIDO2_ALG_ES256 || pubKeyCredParams[i].alg == FIDO2_ALG_ESP256) {
+        if (pubKeyCredParams[i].alg == FIDO2_ALG_ES256) {
             if (curve <= 0) {
                 curve = FIDO2_CURVE_P256;
             }
         }
-        else if (pubKeyCredParams[i].alg == FIDO2_ALG_ES384 || pubKeyCredParams[i].alg == FIDO2_ALG_ESP384) {
-            if (curve <= 0) {
-                curve = FIDO2_CURVE_P384;
-            }
-        }
-        else if (pubKeyCredParams[i].alg == FIDO2_ALG_ES512 || pubKeyCredParams[i].alg == FIDO2_ALG_ESP512) {
-            if (curve <= 0) {
-                curve = FIDO2_CURVE_P521;
-            }
-        }
-        else if (pubKeyCredParams[i].alg == FIDO2_ALG_ESB256) {
-            if (curve <= 0) {
-                curve = FIDO2_CURVE_BP256R1;
-            }
-        }
-        else if (pubKeyCredParams[i].alg == FIDO2_ALG_ESB384) {
-            if (curve <= 0) {
-                curve = FIDO2_CURVE_BP384R1;
-            }
-        }
-        else if (pubKeyCredParams[i].alg == FIDO2_ALG_ESB512) {
-            if (curve <= 0) {
-                curve = FIDO2_CURVE_BP512R1;
-            }
-        }
-        else if (pubKeyCredParams[i].alg == FIDO2_ALG_ES256K
-#ifndef ENABLE_EMULATION
-             && (phy_data.enabled_curves & PHY_CURVE_SECP256K1)
-#endif
-            ) {
-            if (curve <= 0) {
-                curve = FIDO2_CURVE_P256K1;
-            }
-        }
-#ifdef MBEDTLS_EDDSA_C
-        else if (pubKeyCredParams[i].alg == FIDO2_ALG_EDDSA || pubKeyCredParams[i].alg == FIDO2_ALG_ED25519) {
-            if (curve <= 0) {
-                curve = FIDO2_CURVE_ED25519;
-            }
-        }
-        else if (pubKeyCredParams[i].alg == FIDO2_ALG_ED448) {
-            if (curve <= 0) {
-                curve = FIDO2_CURVE_ED448;
-            }
-        }
-#endif
         else if (pubKeyCredParams[i].alg <= FIDO2_ALG_RS256 && pubKeyCredParams[i].alg >= FIDO2_ALG_RS512) {
             // pass
         }
@@ -578,11 +532,6 @@ int cbor_make_credential(const uint8_t *data, size_t len) {
     else if (ekey.grp.id == MBEDTLS_ECP_DP_SECP521R1 || ekey.grp.id == MBEDTLS_ECP_DP_BP512R1) {
         md = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
     }
-#ifdef MBEDTLS_EDDSA_C
-    else if (ekey.grp.id == MBEDTLS_ECP_DP_ED25519 || ekey.grp.id == MBEDTLS_ECP_DP_ED448) {
-        md = NULL;
-    }
-#endif
     if (md != NULL) {
         ret = mbedtls_md(md, aut_data, aut_data_len + clientDataHash.len, hash);
     }
@@ -603,11 +552,6 @@ int cbor_make_credential(const uint8_t *data, size_t len) {
     if (md != NULL) {
         ret = mbedtls_ecdsa_write_signature(&ekey, mbedtls_md_get_type(md), hash, mbedtls_md_get_size(md), sig, sizeof(sig), &olen, random_gen, NULL);
     }
-#ifdef MBEDTLS_EDDSA_C
-    else {
-        ret = mbedtls_eddsa_write_signature(&ekey, aut_data, aut_data_len + clientDataHash.len, sig, sizeof(sig), &olen, MBEDTLS_EDDSA_PURE, NULL, 0, random_gen, NULL);
-    }
-#endif
     mbedtls_ecp_keypair_free(&ekey);
     if (ret != 0) {
         CBOR_ERROR(CTAP2_ERR_PROCESSING);
diff --git a/src/fido/fido.c b/src/fido/fido.c
index d6cb9d9..68dc521 100644
--- a/src/fido/fido.c
+++ b/src/fido/fido.c
@@ -96,67 +96,12 @@ mbedtls_ecp_group_id fido_curve_to_mbedtls(int curve) {
     if (curve == FIDO2_CURVE_P256) {
         return MBEDTLS_ECP_DP_SECP256R1;
     }
-    else if (curve == FIDO2_CURVE_P384) {
-        return MBEDTLS_ECP_DP_SECP384R1;
-    }
-    else if (curve == FIDO2_CURVE_P521) {
-        return MBEDTLS_ECP_DP_SECP521R1;
-    }
-    else if (curve == FIDO2_CURVE_P256K1) {
-        return MBEDTLS_ECP_DP_SECP256K1;
-    }
-    else if (curve == FIDO2_CURVE_X25519) {
-        return MBEDTLS_ECP_DP_CURVE25519;
-    }
-    else if (curve == FIDO2_CURVE_X448) {
-        return MBEDTLS_ECP_DP_CURVE448;
-    }
-#ifdef MBEDTLS_EDDSA_C
-    else if (curve == FIDO2_CURVE_ED25519) {
-        return MBEDTLS_ECP_DP_ED25519;
-    }
-    else if (curve == FIDO2_CURVE_ED448) {
-        return MBEDTLS_ECP_DP_ED448;
-    }
-#endif
-    else if (curve == FIDO2_CURVE_BP256R1) {
-        return MBEDTLS_ECP_DP_BP256R1;
-    }
-    else if (curve == FIDO2_CURVE_BP384R1) {
-        return MBEDTLS_ECP_DP_BP384R1;
-    }
-    else if (curve == FIDO2_CURVE_BP512R1) {
-        return MBEDTLS_ECP_DP_BP512R1;
-    }
     return MBEDTLS_ECP_DP_NONE;
 }
 int mbedtls_curve_to_fido(mbedtls_ecp_group_id id) {
     if (id == MBEDTLS_ECP_DP_SECP256R1) {
         return FIDO2_CURVE_P256;
     }
-    else if (id == MBEDTLS_ECP_DP_SECP384R1) {
-        return FIDO2_CURVE_P384;
-    }
-    else if (id == MBEDTLS_ECP_DP_SECP521R1) {
-        return FIDO2_CURVE_P521;
-    }
-    else if (id == MBEDTLS_ECP_DP_SECP256K1) {
-        return FIDO2_CURVE_P256K1;
-    }
-    else if (id == MBEDTLS_ECP_DP_CURVE25519) {
-        return MBEDTLS_ECP_DP_CURVE25519;
-    }
-    else if (id == MBEDTLS_ECP_DP_CURVE448) {
-        return FIDO2_CURVE_X448;
-    }
-#ifdef MBEDTLS_EDDSA_C
-    else if (id == MBEDTLS_ECP_DP_ED25519) {
-        return FIDO2_CURVE_ED25519;
-    }
-    else if (id == MBEDTLS_ECP_DP_ED448) {
-        return FIDO2_CURVE_ED448;
-    }
-#endif
     return 0;
 }
 
@@ -330,11 +275,6 @@ int derive_key(const uint8_t *app_id, bool new_key, uint8_t *key_handle, int cur
         if (r != 0) {
             return r;
         }
-#ifdef MBEDTLS_EDDSA_C
-        if (curve == MBEDTLS_ECP_DP_ED25519) {
-            return mbedtls_ecp_point_edwards(&key->grp, &key->Q, &key->d, random_gen, NULL);
-        }
-#endif
         return mbedtls_ecp_mul(&key->grp, &key->Q, &key->d, &key->grp.G, random_gen, NULL);
     }
     mbedtls_platform_zeroize(outk, sizeof(outk));
diff --git a/src/fido/fido.h b/src/fido/fido.h
index 481aa6c..15f9f40 100644
--- a/src/fido/fido.h
+++ b/src/fido/fido.h
@@ -28,9 +28,6 @@
 #endif
 
 #include "mbedtls/ecdsa.h"
-#ifdef MBEDTLS_EDDSA_C
-#include "mbedtls/eddsa.h"
-#endif
 #include "hid/ctap_hid.h"
 
 #define CTAP_PUBKEY_LEN (65)
@@ -57,34 +54,12 @@ extern int decrypt(uint8_t protocol, const uint8_t *key, const uint8_t *in, uint
 extern int ecdh(uint8_t protocol, const mbedtls_ecp_point *Q, uint8_t *sharedSecret);
 
 #define FIDO2_ALG_ES256     -7 //ECDSA-SHA256
-#define FIDO2_ALG_EDDSA     -8 //EdDSA
-#define FIDO2_ALG_ESP256    -9 //ECDSA-SHA256 P256
-#define FIDO2_ALG_ED25519   -19 //EDDSA Ed25519
-#define FIDO2_ALG_ES384     -35 //ECDSA-SHA384
-#define FIDO2_ALG_ES512     -36 //ECDSA-SHA512
-#define FIDO2_ALG_ECDH_ES_HKDF_256 -25 //ECDH-ES + HKDF-256
-#define FIDO2_ALG_ES256K    -47
-#define FIDO2_ALG_ESP384    -51 //ECDSA-SHA384 P384
-#define FIDO2_ALG_ESP512    -52 //ECDSA-SHA512 P521
-#define FIDO2_ALG_ED448     -53 //EDDSA Ed448
 #define FIDO2_ALG_RS256     -257
 #define FIDO2_ALG_RS384     -258
 #define FIDO2_ALG_RS512     -259
-#define FIDO2_ALG_ESB256    -265 //ECDSA-SHA256 BP256r1
-#define FIDO2_ALG_ESB384    -267 //ECDSA-SHA384 BP384r1
-#define FIDO2_ALG_ESB512    -268 //ECDSA-SHA512 BP512r1
 
 #define FIDO2_CURVE_P256        1
-#define FIDO2_CURVE_P384        2
-#define FIDO2_CURVE_P521        3
-#define FIDO2_CURVE_X25519      4
-#define FIDO2_CURVE_X448        5
-#define FIDO2_CURVE_ED25519     6
-#define FIDO2_CURVE_ED448       7
-#define FIDO2_CURVE_P256K1      8
-#define FIDO2_CURVE_BP256R1     9
-#define FIDO2_CURVE_BP384R1     10
-#define FIDO2_CURVE_BP512R1     11
+#define FIDO2_ALG_ECDH_ES_HKDF_256 -25 //ECDH-ES + HKDF-256
 
 #define FIDO2_AUT_FLAG_UP       0x1
 #define FIDO2_AUT_FLAG_UV       0x4
diff --git a/src/fido/management.c b/src/fido/management.c
index 3a61178..af3a67d 100644
--- a/src/fido/management.c
+++ b/src/fido/management.c
@@ -23,6 +23,8 @@
 #include "asn1.h"
 #include "management.h"
 
+bool is_gpg = true;
+
 int man_process_apdu();
 int man_unload();
 
@@ -44,6 +46,7 @@ int man_select(app_t *a, uint8_t force) {
         init_otp();
 #endif
     }
+    is_gpg = false;
     return PICOKEY_OK;
 }