diff --git a/src/com/amazon/corretto/crypto/provider/EdGen.java b/src/com/amazon/corretto/crypto/provider/EdGen.java
index 0a685e17..2fc75d0e 100644
--- a/src/com/amazon/corretto/crypto/provider/EdGen.java
+++ b/src/com/amazon/corretto/crypto/provider/EdGen.java
@@ -5,7 +5,6 @@
 import java.security.KeyPair;
 import java.security.KeyPairGeneratorSpi;
 import java.security.SecureRandom;
-// import java.security.spec.NamedParameterSpec;
 
 class EdGen extends KeyPairGeneratorSpi {
   /**
@@ -17,7 +16,6 @@ class EdGen extends KeyPairGeneratorSpi {
   private static native long generateEvpEdEcKey();
 
   private final AmazonCorrettoCryptoProvider provider_;
-  // private NamedParameterSpec spec = NamedParameterSpec.ED25519;
 
   EdGen(AmazonCorrettoCryptoProvider provider) {
     Loader.checkNativeLibraryAvailability();
@@ -35,8 +33,6 @@ public KeyPair generateKeyPair() {
     final EvpEdEcPublicKey publicKey;
     privateKey = new EvpEdEcPrivateKey(generateEvpEdEcKey());
     publicKey = privateKey.getPublicKey();
-    // privateKey = new EvpEcPrivateKey((long) ecParams.use(ptr -> generateEvpEcKey(ptr,
-    // keyGenConsistency)));
     return new KeyPair(publicKey, privateKey);
   }
 }
diff --git a/src/com/amazon/corretto/crypto/provider/EvpEdEcKey.java b/src/com/amazon/corretto/crypto/provider/EvpEdEcKey.java
index 6dba8499..4984737b 100644
--- a/src/com/amazon/corretto/crypto/provider/EvpEdEcKey.java
+++ b/src/com/amazon/corretto/crypto/provider/EvpEdEcKey.java
@@ -2,18 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 package com.amazon.corretto.crypto.provider;
 
-// import java.security.interfaces.EdECKey;
-// import java.security.spec.NamedParameterSpec;
-
 abstract class EvpEdEcKey extends EvpKey {
   private static final long serialVersionUID = 1;
 
   EvpEdEcKey(final InternalKey key, final boolean isPublicKey) {
     super(key, EvpKeyType.Ed25519, isPublicKey);
   }
-
-  // @Override
-  //    public NamedParameterSpec getParams() {
-  //        return NamedParameterSpec.ED25519;
-  //    }
 }
diff --git a/src/com/amazon/corretto/crypto/provider/EvpKeyType.java b/src/com/amazon/corretto/crypto/provider/EvpKeyType.java
index 4e61d3cb..27b1b0c3 100644
--- a/src/com/amazon/corretto/crypto/provider/EvpKeyType.java
+++ b/src/com/amazon/corretto/crypto/provider/EvpKeyType.java
@@ -8,8 +8,6 @@
 import java.security.interfaces.ECPublicKey;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
-// import java.security.interfaces.EdECPrivateKey;
-// import java.security.interfaces.EdECPublicKey;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.EnumSet;