diff --git a/java/ql/lib/ext/com.sun.crypto.provider.model.yml b/java/ql/lib/ext/com.sun.crypto.provider.model.yml
index a3da3975d81..2867fdd0c73 100644
--- a/java/ql/lib/ext/com.sun.crypto.provider.model.yml
+++ b/java/ql/lib/ext/com.sun.crypto.provider.model.yml
@@ -5,20 +5,12 @@ extensions:
     data:
       - ["com.sun.crypto.provider", "JceKeyStore", False, "getPreKeyedHash", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
       - ["com.sun.crypto.provider", "KeyProtector", False, "KeyProtector", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
-      - ["com.sun.crypto.provider", "PBKDF2KeyImpl", False, "deriveKey", "(Mac,byte[],byte[],int,int)", "", "Argument[1]", "credentials-password", "manual"]
-      - ["com.sun.crypto.provider", "PBKDF2KeyImpl", False, "getPasswordBytes", "(char[])", "", "Argument[0]", "credentials-password", "manual"]
       - ["com.sun.crypto.provider", "AESCrypt", False, "init", "(boolean,String,byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
       - ["com.sun.crypto.provider", "ARCFOURCipher", False, "init", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
       - ["com.sun.crypto.provider", "BlowfishCrypt", False, "init", "(boolean,String,byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
       - ["com.sun.crypto.provider", "CipherBlockChaining", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
       - ["com.sun.crypto.provider", "CipherCore", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
       - ["com.sun.crypto.provider", "CipherFeedback", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
-      - ["com.sun.crypto.provider", "CipherWithWrappingSpi", False, "constructPrivateKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
-      - ["com.sun.crypto.provider", "CipherWithWrappingSpi", False, "constructPublicKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
-      - ["com.sun.crypto.provider", "CipherWithWrappingSpi", False, "constructSecretKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
-      - ["com.sun.crypto.provider", "ConstructKeys", False, "constructPrivateKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
-      - ["com.sun.crypto.provider", "ConstructKeys", False, "constructPublicKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
-      - ["com.sun.crypto.provider", "ConstructKeys", False, "constructSecretKey", "(byte[],String)", "", "Argument[0]", "crypto-parameter", "manual"]
       - ["com.sun.crypto.provider", "CounterMode", False, "init", "(boolean,String,byte[],byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
       - ["com.sun.crypto.provider", "DESCrypt", False, "expandKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
       - ["com.sun.crypto.provider", "DESCrypt", False, "init", "(boolean,String,byte[])", "", "Argument[2]", "crypto-parameter", "manual"]
diff --git a/java/ql/lib/ext/javax.crypto.model.yml b/java/ql/lib/ext/javax.crypto.model.yml
index 0cf0099439c..58b7a5c31b4 100644
--- a/java/ql/lib/ext/javax.crypto.model.yml
+++ b/java/ql/lib/ext/javax.crypto.model.yml
@@ -6,5 +6,4 @@ extensions:
       - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec)", "", "Argument[2]", "encryption-iv", "manual"]
       - ["javax.crypto", "Cipher", True, "init", "(int,Key,AlgorithmParameterSpec,SecureRandom)", "", "Argument[2]", "encryption-iv", "manual"]
       - ["javax.crypto", "Cipher", False, "unwrap", "(byte[],String,int)", "", "Argument[0]", "crypto-parameter", "manual"]
-      - ["javax.crypto", "EncryptedPrivateKeyInfo", False, "checkPKCS8Encoding", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
       - ["javax.crypto", "CipherSpi", True, "engineUnwrap", "(byte[],String,int)", "", "Argument[0]", "credentials-key", "manual"]
diff --git a/java/ql/lib/ext/sun.security.jgss.krb5.model.yml b/java/ql/lib/ext/sun.security.jgss.krb5.model.yml
index 4873fe6f61c..ec6f0f1302a 100644
--- a/java/ql/lib/ext/sun.security.jgss.krb5.model.yml
+++ b/java/ql/lib/ext/sun.security.jgss.krb5.model.yml
@@ -3,10 +3,5 @@ extensions:
       pack: codeql/java-all
       extensible: sinkModel
     data:
-      - ["sun.security.jgss.krb5", "CipherHelper", False, "desCbcDecrypt", "(WrapToken,byte[],InputStream,int,byte[],int)", "", "Argument[1]", "crypto-parameter", "manual"]
-      - ["sun.security.jgss.krb5", "CipherHelper", False, "desCbcDecrypt", "(WrapToken,byte[],byte[],int,int,byte[],int)", "", "Argument[1]", "crypto-parameter", "manual"]
-      - ["sun.security.jgss.krb5", "CipherHelper", False, "getDesCbcChecksum", "(byte[],byte[],byte[],int,int)", "", "Argument[0]", "crypto-parameter", "manual"]
-      - ["sun.security.jgss.krb5", "CipherHelper", False, "getDesEncryptionKey", "(byte[])", "", "Argument[0]", "crypto-parameter", "manual"]
-      - ["sun.security.jgss.krb5", "CipherHelper", False, "getInitializedDes", "(boolean,byte[],byte[])", "", "Argument[1]", "crypto-parameter", "manual"]
       - ["sun.security.jgss.krb5", "Krb5InitCredential", False, "Krb5InitCredential", "(Krb5NameElement,Credentials,byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[5]", "crypto-parameter", "manual"]
       - ["sun.security.jgss.krb5", "Krb5InitCredential", False, "Krb5InitCredential", "(Krb5NameElement,byte[],KerberosPrincipal,KerberosPrincipal,byte[],int,boolean[],Date,Date,Date,Date,InetAddress[])", "", "Argument[4]", "crypto-parameter", "manual"]