diff --git a/tls/s2n_handshake_io.c b/tls/s2n_handshake_io.c
index 60f1f38d..361767c6 100755
--- a/tls/s2n_handshake_io.c
+++ b/tls/s2n_handshake_io.c
@@ -241,7 +241,7 @@ static message_type_t handshakes[S2N_HANDSHAKES_COUNT][S2N_MAX_HANDSHAKE_LENGTH]
             APPLICATION_DATA
     },
 
-    [NEGOTIATED | FULL_HANDSHAKE | OCSP_STATUS ] ={
+    [NEGOTIATED | OCSP_STATUS ] ={
             CLIENT_HELLO,
             SERVER_HELLO, SERVER_CERT, SERVER_CERT_STATUS, SERVER_HELLO_DONE,
             CLIENT_KEY, CLIENT_CHANGE_CIPHER_SPEC, CLIENT_FINISHED,
@@ -257,7 +257,7 @@ static message_type_t handshakes[S2N_HANDSHAKES_COUNT][S2N_MAX_HANDSHAKE_LENGTH]
             APPLICATION_DATA
     },
 
-    [NEGOTIATED | FULL_HANDSHAKE | OCSP_STATUS | WITH_SESSION_TICKET ] = {
+    [NEGOTIATED | OCSP_STATUS | WITH_SESSION_TICKET ] = {
             CLIENT_HELLO,
             SERVER_HELLO, SERVER_CERT, SERVER_CERT_STATUS, SERVER_HELLO_DONE,
             CLIENT_KEY, CLIENT_CHANGE_CIPHER_SPEC, CLIENT_FINISHED,
@@ -433,14 +433,6 @@ static message_type_t handshakes[S2N_HANDSHAKES_COUNT][S2N_MAX_HANDSHAKE_LENGTH]
            APPLICATION_DATA
     },
 
-    [NEGOTIATED | FULL_HANDSHAKE | OCSP_STATUS | CLIENT_AUTH] = {
-           CLIENT_HELLO,
-           SERVER_HELLO, SERVER_CERT, SERVER_CERT_STATUS, SERVER_CERT_REQ, SERVER_HELLO_DONE,
-           CLIENT_CERT, CLIENT_KEY, CLIENT_CERT_VERIFY, CLIENT_CHANGE_CIPHER_SPEC, CLIENT_FINISHED,
-           SERVER_CHANGE_CIPHER_SPEC, SERVER_FINISHED,
-           APPLICATION_DATA
-    },
-
     [NEGOTIATED | FULL_HANDSHAKE | OCSP_STATUS | CLIENT_AUTH | WITH_NPN ] = {
            CLIENT_HELLO,
            SERVER_HELLO, SERVER_CERT, SERVER_CERT_STATUS, SERVER_CERT_REQ, SERVER_HELLO_DONE,