diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index 24edf556..26019742 100644
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -416,11 +416,6 @@ extern "C" {
 #define TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 0x0300CCA9
 #define TLS1_CK_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256 0x0300CCAC
 
-/* TODO(davidben): Remove this. Historically, the CK names for CHACHA20_POLY1305
- * were missing 'WITH' and 'SHA256'. */
-#define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305 \
-  TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-
 /* TLS 1.3 ciphersuites from draft-ietf-tls-tls13-16 */
 #define TLS1_CK_AES_128_GCM_SHA256 0x03001301
 #define TLS1_CK_AES_256_GCM_SHA384 0x03001302
@@ -593,11 +588,6 @@ extern "C" {
 #define TLS1_TXT_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256 \
   "ECDHE-PSK-CHACHA20-POLY1305"
 
-/* TODO(davidben): Remove this. Historically, the TXT names for
- * CHACHA20_POLY1305 were missing 'SHA256'. */
-#define TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 \
-  TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-
 /* TLS 1.3 ciphersuites from draft-ietf-tls-tls13-16 */
 #define TLS1_TXT_AES_128_GCM_SHA256 "AEAD-AES128-GCM-SHA256"
 #define TLS1_TXT_AES_256_GCM_SHA384 "AEAD-AES256-GCM-SHA384"