--- lib/Net/SSH/Perl/Constants.pm
+++ lib/Net/SSH/Perl/Constants.pm
@@ -131,7 +131,7 @@ use vars qw( %CONSTANTS );
     'KEX_DH_GEX_SHA1' => 'diffie-hellman-group-exchange-sha1',
     'KEX_CURVE25519_SHA256' => 'curve25519-sha256@libssh.org',
     'KEX_CURVE25519_SHA256_ALIAS' => 'curve25519-sha256',
-    'KEX_DEFAULT_KEX' => 'curve25519-sha256@libssh.org,curve25519-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group-exchange-sha256,diffie-hellman-group14-sha256,diffie-hellman-group14-sha1',
+    'KEX_DEFAULT_KEX' => 'diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group-exchange-sha256,diffie-hellman-group14-sha256,diffie-hellman-group14-sha1',
     'KEX_ALL_KEX' => 'diffie-hellman-group1-sha1,diffie-hellman-group14-sha1,diffie-hellman-group14-sha256,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group-exchange-sha256,diffie-hellman-group-exchange-sha1,curve25519-sha256@libssh.org,curve25519-sha256',
     'KEX_DEFAULT_PK_ALG' => 'ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256,ssh-rsa',
     'KEX_ALL_PK_ALG' => 'ssh-ed25519,rsa-sha2-512,rsa-sha2-256,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256,ssh-rsa,ssh-dss',
--- lib/Net/SSH/Perl/Kex.pm
+++ lib/Net/SSH/Perl/Kex.pm
@@ -220,9 +220,6 @@ sub choose_kex {
     croak "No kex algorithm" unless $name;
     $kex->{algorithm} = $name;
     my %kexmap = (
-        &KEX_CURVE25519_SHA256 => 'C25519',
-        &KEX_CURVE25519_SHA256_ALIAS
-                               => 'C25519',
         &KEX_DH_GEX_SHA256     => 'DHGEXSHA256',
         &KEX_DH_GEX_SHA1       => 'DHGEXSHA1',
         &KEX_DH14_SHA1         => 'DH14SHA1',
--- lib/Net/SSH/Perl/Key.pm
+++ lib/Net/SSH/Perl/Key.pm
@@ -26,9 +26,6 @@ use vars qw( %KEY_TYPES );
     'ssh-dss' => 'DSA',
     'ssh-rsa' => 'RSA',
     'ssh-ed25519' => 'Ed25519',
-    'ecdsa-sha2-nistp256' => 'ECDSA256',
-    'ecdsa-sha2-nistp384' => 'ECDSA384',
-    'ecdsa-sha2-nistp521' => 'ECDSA521',
 );
 
 sub new_from_blob {
@@ -95,7 +92,6 @@ use vars qw( %OBJ_MAP );
     'SSH2 ENCRYPTED PRIVATE KEY' => [ 'DSA', [ 'SSH2' ] ],
     'RSA PRIVATE KEY'  => [ 'RSA' ],
     'OPENSSH PRIVATE KEY'  => [ 'Ed25519' ],
-    'EC PRIVATE KEY' => [ 'ECDSA' ],
 );
 
 sub read_private_pem {
@@ -167,8 +163,8 @@ Net::SSH::Perl::Key - Public or private
 =head1 DESCRIPTION
 
 I<Net::SSH::Perl::Key> implements an abstract base class interface
-to key objects (either DSA, RSA, ECDSA, or Ed25519 keys, currently).
-The underlying implementation for RSA, DSA, an ECDSA keys is the
+to key objects (either DSA, RSA, or Ed25519 keys, currently).
+The underlying implementation for RSA, and DSA keys is the
 CryptX module.  The Ed25519 implementation uses bundled XS and C code
 from the SUPERCOP ref10 implementation.
 
@@ -178,8 +174,7 @@ from the SUPERCOP ref10 implementation.
 
 Creates a new object of type I<Net::SSH::Perl::Key::$key_type>,
 after loading the class implementing I<$key_type>.
-should be C<DSA>, C<RSA1>, C<RSA>, C<ECDSA256>, C<ECDSA384>, C<ECDSA521>,
-or C<Ed25519>.  
+should be C<DSA>, C<RSA1>, C<RSA>, or C<Ed25519>.  
 
 I<$blob>, if present, should be a string representation of the key,
 from which the key object can be initialized. In fact, it should
@@ -209,11 +204,11 @@ passphrase, this might be a good time to
 actual passphrase. :)
 
 Returns the new key object, which is blessed into the subclass
-denoted by I<$key_type> (C<DSA>, C<RSA1>, C<ECDSA> or C<Ed25519>).
+denoted by I<$key_type> (C<DSA>, C<RSA1> or C<Ed25519>).
 
 =head2 Net::SSH::Perl::Key->keygen($key_type, $bits)
 
-$key_type is one of RSA, DSA, or ECDSA256/ECDSA384/ECDSA521.
+$key_type is one of RSA or DSA.
 Generates a new key and returns that key. The key returned is the 
 private key, which (presumably) contains all of the public key
 data, as well. I<$bits> is the number of bits in the key.
--- lib/Net/SSH/Perl.pm
+++ lib/Net/SSH/Perl.pm
@@ -492,7 +492,7 @@ of the SSH protocol, and makes use of ex
 the Crypt:: family of modules) to handle encryption of all data sent
 across the insecure network. It can also read your existing SSH
 configuration files (F</etc/ssh_config>, etc.), RSA identity files,
-ECDSA identity files, Ed25519 identity files, known hosts files, etc.
+Ed25519 identity files, known hosts files, etc.
 
 One advantage to using I<Net::SSH::Perl> over wrapper-style
 implementations of ssh clients is that it saves on process
--- MANIFEST
+++ MANIFEST
@@ -46,7 +46,6 @@ lib/Net/SSH/Perl/Constants.pm
 lib/Net/SSH/Perl/Handle/SSH1.pm
 lib/Net/SSH/Perl/Handle/SSH2.pm
 lib/Net/SSH/Perl/Handle.pm
-lib/Net/SSH/Perl/Kex/C25519.pm
 lib/Net/SSH/Perl/Kex/DH.pm
 lib/Net/SSH/Perl/Kex/DH1.pm
 lib/Net/SSH/Perl/Kex/DH14SHA1.pm
@@ -58,10 +57,6 @@ lib/Net/SSH/Perl/Kex/DHGEXSHA1.pm
 lib/Net/SSH/Perl/Kex/DHGEXSHA256.pm
 lib/Net/SSH/Perl/Kex.pm
 lib/Net/SSH/Perl/Key/DSA.pm
-lib/Net/SSH/Perl/Key/ECDSA.pm
-lib/Net/SSH/Perl/Key/ECDSA256.pm
-lib/Net/SSH/Perl/Key/ECDSA384.pm
-lib/Net/SSH/Perl/Key/ECDSA521.pm
 lib/Net/SSH/Perl/Key/Ed25519.pm
 lib/Net/SSH/Perl/Key/Ed25519.xs
 lib/Net/SSH/Perl/Key/RSA.pm