diff --git a/srcgen/core-platform-api.txt b/srcgen/core-platform-api.txt
index 859d638..cd3a540 100644
--- a/srcgen/core-platform-api.txt
+++ b/srcgen/core-platform-api.txt
@@ -1,4 +1,3 @@
-# TODO: Remove comments and sort.
 field:com.android.org.bouncycastle.asn1.DERNull#INSTANCE
 field:com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers#sha256WithRSAEncryption
 field:com.android.org.bouncycastle.asn1.x509.GeneralName#dNSName
@@ -9,17 +8,24 @@
 field:com.android.org.bouncycastle.asn1.x509.X509Name#O
 field:com.android.org.bouncycastle.asn1.x509.X509Name#OU
 field:com.android.org.bouncycastle.asn1.x9.X9ObjectIdentifiers#ecdsa_with_SHA256
+method:com.android.org.bouncycastle.asn1.ASN1BitString#hashCode()
 method:com.android.org.bouncycastle.asn1.ASN1EncodableVector#add(ASN1Encodable)
 method:com.android.org.bouncycastle.asn1.ASN1EncodableVector#ASN1EncodableVector()
-method:com.android.org.bouncycastle.asn1.ASN1InputStream#ASN1InputStream(InputStream)
 method:com.android.org.bouncycastle.asn1.ASN1InputStream#ASN1InputStream(byte[])
+method:com.android.org.bouncycastle.asn1.ASN1InputStream#ASN1InputStream(InputStream)
 method:com.android.org.bouncycastle.asn1.ASN1InputStream#readObject()
 method:com.android.org.bouncycastle.asn1.ASN1Integer#ASN1Integer(BigInteger)
+method:com.android.org.bouncycastle.asn1.ASN1Null#hashCode()
+method:com.android.org.bouncycastle.asn1.ASN1Object#getEncoded()
+method:com.android.org.bouncycastle.asn1.ASN1Object#getEncoded(String)
+method:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier#ASN1ObjectIdentifier(String)
 method:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier#getId()
 method:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier#getInstance(Object)
-method:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier#ASN1ObjectIdentifier(String)
 method:com.android.org.bouncycastle.asn1.ASN1OctetString#getOctets()
 method:com.android.org.bouncycastle.asn1.ASN1OctetString#hashCode()
+method:com.android.org.bouncycastle.asn1.ASN1Sequence#getObjectAt(int)
+method:com.android.org.bouncycastle.asn1.ASN1Sequence#hashCode()
+method:com.android.org.bouncycastle.asn1.ASN1Sequence#size()
 method:com.android.org.bouncycastle.asn1.ASN1TaggedObject#getObject()
 method:com.android.org.bouncycastle.asn1.ASN1TaggedObject#hashCode()
 method:com.android.org.bouncycastle.asn1.DERBitString#DERBitString(byte[])
@@ -32,9 +38,9 @@
 method:com.android.org.bouncycastle.asn1.DERUTF8String#getString()
 method:com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo#getInstance(Object)
 method:com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo#getPrivateKeyAlgorithm()
-method:com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier#getAlgorithm()
 method:com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier#AlgorithmIdentifier(ASN1ObjectIdentifier)
 method:com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier#AlgorithmIdentifier(ASN1ObjectIdentifier,ASN1Encodable)
+method:com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier#getAlgorithm()
 method:com.android.org.bouncycastle.asn1.x509.BasicConstraints#getInstance(Object)
 method:com.android.org.bouncycastle.asn1.x509.BasicConstraints#isCA()
 method:com.android.org.bouncycastle.asn1.x509.Certificate#getInstance(Object)
@@ -52,13 +58,14 @@
 method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#setSubjectPublicKeyInfo(SubjectPublicKeyInfo)
 method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#setSubject(X509Name)
 method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#V3TBSCertificateGenerator()
+method:com.android.org.bouncycastle.asn1.x509.X509Name#getInstance(Object)
 method:com.android.org.bouncycastle.asn1.x509.X509Name#getOIDs()
 method:com.android.org.bouncycastle.asn1.x509.X509Name#getValues()
-method:com.android.org.bouncycastle.asn1.x509.X509Name#X509Name(String)
-method:com.android.org.bouncycastle.asn1.x509.X509Name#getInstance(Object)
 method:com.android.org.bouncycastle.asn1.x509.X509Name#toString(boolean,Hashtable)
-method:com.android.org.bouncycastle.jce.X509Principal#X509Principal(byte[])
+method:com.android.org.bouncycastle.asn1.x509.X509Name#X509Name(String)
 method:com.android.org.bouncycastle.jce.provider.BouncyCastleProvider#BouncyCastleProvider()
+method:com.android.org.bouncycastle.jce.provider.X509CertificateObject#X509CertificateObject(com.android.org.bouncycastle.asn1.x509.Certificate)
+method:com.android.org.bouncycastle.jce.X509Principal#X509Principal(byte[])
 method:com.android.org.bouncycastle.util.io.pem.PemObject#getContent()
 method:com.android.org.bouncycastle.util.io.pem.PemObject#getType()
 method:com.android.org.bouncycastle.util.io.pem.PemObject#PemObject(String,byte[])
@@ -75,13 +82,17 @@
 method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#setSignatureAlgorithm(String)
 method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#setSubjectDN(X500Principal)
 method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#X509V3CertificateGenerator()
+type:com.android.org.bouncycastle.asn1.ASN1BitString
 type:com.android.org.bouncycastle.asn1.ASN1Encodable
 type:com.android.org.bouncycastle.asn1.ASN1EncodableVector
 type:com.android.org.bouncycastle.asn1.ASN1InputStream
 type:com.android.org.bouncycastle.asn1.ASN1Integer
+type:com.android.org.bouncycastle.asn1.ASN1Null
+type:com.android.org.bouncycastle.asn1.ASN1Object
 type:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier
 type:com.android.org.bouncycastle.asn1.ASN1OctetString
 type:com.android.org.bouncycastle.asn1.ASN1Primitive
+type:com.android.org.bouncycastle.asn1.ASN1Sequence
 type:com.android.org.bouncycastle.asn1.ASN1TaggedObject
 type:com.android.org.bouncycastle.asn1.DERBitString
 type:com.android.org.bouncycastle.asn1.DERInteger
@@ -109,36 +120,5 @@
 type:com.android.org.bouncycastle.util.io.pem.PemObjectGenerator
 type:com.android.org.bouncycastle.util.io.pem.PemReader
 type:com.android.org.bouncycastle.util.io.pem.PemWriter
-type:com.android.org.bouncycastle.x509.X509V3CertificateGenerator
-
-# BEGIN: Manually added as tool did not find it or generated incorrect locator
-
-# Needed for stubs generation, otherwise cannot convert to ASN1Encodable
-type:com.android.org.bouncycastle.asn1.ASN1Object
-
-# Got the wrong class
-# method:com.android.org.bouncycastle.asn1.DERSequence#getEncoded()
-method:com.android.org.bouncycastle.asn1.ASN1Object#getEncoded()
-method:com.android.org.bouncycastle.asn1.ASN1Object#getEncoded(String)
-
-# Unqualified name
-# method:com.android.org.bouncycastle.jce.provider.X509CertificateObject#X509CertificateObject(Certificate)
-method:com.android.org.bouncycastle.jce.provider.X509CertificateObject#X509CertificateObject(com.android.org.bouncycastle.asn1.x509.Certificate)
-
-# END
-
-# BEGIN: Avoid b/116777737
 type:com.android.org.bouncycastle.util.Iterable
-# END
-
-# BEGIN: Added as stubs generator will add an abstract hashCode() method to the ASN1Primitive
-# superclass even though that is marked @hide.
-type:com.android.org.bouncycastle.asn1.ASN1BitString
-type:com.android.org.bouncycastle.asn1.ASN1Null
-type:com.android.org.bouncycastle.asn1.ASN1Sequence
-method:com.android.org.bouncycastle.asn1.ASN1BitString#hashCode()
-method:com.android.org.bouncycastle.asn1.ASN1Null#hashCode()
-method:com.android.org.bouncycastle.asn1.ASN1Sequence#getObjectAt(int)
-method:com.android.org.bouncycastle.asn1.ASN1Sequence#hashCode()
-method:com.android.org.bouncycastle.asn1.ASN1Sequence#size()
-# END
+type:com.android.org.bouncycastle.x509.X509V3CertificateGenerator