diff --git a/include/polarssl/x509.h b/include/polarssl/x509.h
index 24e3453..47b5ab8 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -212,7 +212,6 @@
     x509_time valid_to;         /**< End time of certificate validity. */
 
     pk_context pk;              /**< Container for the public key context. */
-    rsa_context rsa;            /**< Container for the RSA context. Kept for compatibility while transitioning to generic PK */
 
     x509_buf issuer_id;         /**< Optional X.509 v2/v3 issuer unique identifier. */
     x509_buf subject_id;        /**< Optional X.509 v2/v3 subject unique identifier. */
diff --git a/library/x509parse.c b/library/x509parse.c
index 6c848b7..f036526 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -1423,17 +1423,6 @@
     }
 
     /*
-     * Temporary hack for compatibility while transitioning to PK abstraction
-     * (Cannot use rsa_wrap above since it would force RSA key type.)
-     */
-    if( crt->pk.type == POLARSSL_PK_RSA ) {
-        memcpy( &crt->rsa, pk_rsa( crt->pk ), sizeof( rsa_context ) );
-        free( crt->pk.data );
-        crt->pk.data = &crt->rsa;
-        crt->pk.dont_free = 1;
-    }
-
-    /*
      *  issuerUniqueID  [1]  IMPLICIT UniqueIdentifier OPTIONAL,
      *                       -- If present, version shall be v2 or v3
      *  subjectUniqueID [2]  IMPLICIT UniqueIdentifier OPTIONAL,
@@ -4011,7 +4000,6 @@
     do
     {
         pk_free( &cert_cur->pk );
-        rsa_free( &cert_cur->rsa );
 
         name_cur = cert_cur->issuer.next;
         while( name_cur != NULL )