diff --git a/pgpainless-core/src/main/java/org/pgpainless/implementation/BcImplementationFactory.java b/pgpainless-core/src/main/java/org/pgpainless/implementation/BcImplementationFactory.java
index c8e86311..cbc320e6 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/implementation/BcImplementationFactory.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/implementation/BcImplementationFactory.java
@@ -15,7 +15,6 @@ import org.bouncycastle.openpgp.PGPKeyPair;
 import org.bouncycastle.openpgp.PGPObjectFactory;
 import org.bouncycastle.openpgp.PGPPrivateKey;
 import org.bouncycastle.openpgp.PGPPublicKey;
-import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSessionKey;
 import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
@@ -52,23 +51,6 @@ import org.pgpainless.util.Passphrase;
 
 public class BcImplementationFactory extends ImplementationFactory {
 
-    @Override
-    public PBESecretKeyEncryptor getPBESecretKeyEncryptor(PGPSecretKey secretKey, Passphrase passphrase)
-            throws PGPException {
-        int keyEncryptionAlgorithm = secretKey.getKeyEncryptionAlgorithm();
-
-        if (secretKey.getS2K() == null) {
-            return getPBESecretKeyEncryptor(SymmetricKeyAlgorithm.requireFromId(keyEncryptionAlgorithm), passphrase);
-        }
-
-        int hashAlgorithm = secretKey.getS2K().getHashAlgorithm();
-        PGPDigestCalculator digestCalculator = getPGPDigestCalculator(hashAlgorithm);
-        long iterationCount = secretKey.getS2K().getIterationCount();
-
-        return new BcPBESecretKeyEncryptorBuilder(keyEncryptionAlgorithm, digestCalculator, (int) iterationCount)
-                .build(passphrase.getChars());
-    }
-
     @Override
     public PBESecretKeyEncryptor getPBESecretKeyEncryptor(SymmetricKeyAlgorithm symmetricKeyAlgorithm,
                                                           PGPDigestCalculator digestCalculator,
diff --git a/pgpainless-core/src/main/java/org/pgpainless/implementation/ImplementationFactory.java b/pgpainless-core/src/main/java/org/pgpainless/implementation/ImplementationFactory.java
index 06065838..90d1330f 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/implementation/ImplementationFactory.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/implementation/ImplementationFactory.java
@@ -13,7 +13,6 @@ import org.bouncycastle.openpgp.PGPKeyPair;
 import org.bouncycastle.openpgp.PGPObjectFactory;
 import org.bouncycastle.openpgp.PGPPrivateKey;
 import org.bouncycastle.openpgp.PGPPublicKey;
-import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSessionKey;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
 import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory;
@@ -49,15 +48,6 @@ public abstract class ImplementationFactory {
         return FACTORY_IMPLEMENTATION;
     }
 
-    public PBESecretKeyEncryptor getPBESecretKeyEncryptor(SymmetricKeyAlgorithm symmetricKeyAlgorithm,
-                                                          Passphrase passphrase)
-            throws PGPException {
-        return getPBESecretKeyEncryptor(symmetricKeyAlgorithm,
-                getPGPDigestCalculator(HashAlgorithm.SHA1), passphrase);
-    }
-
-    public abstract PBESecretKeyEncryptor getPBESecretKeyEncryptor(PGPSecretKey secretKey, Passphrase passphrase) throws PGPException;
-
     public abstract PBESecretKeyEncryptor getPBESecretKeyEncryptor(SymmetricKeyAlgorithm symmetricKeyAlgorithm,
                                                                    PGPDigestCalculator digestCalculator,
                                                                    Passphrase passphrase);
diff --git a/pgpainless-core/src/main/java/org/pgpainless/implementation/JceImplementationFactory.java b/pgpainless-core/src/main/java/org/pgpainless/implementation/JceImplementationFactory.java
index bb3b0e0b..10760de2 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/implementation/JceImplementationFactory.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/implementation/JceImplementationFactory.java
@@ -13,7 +13,6 @@ import org.bouncycastle.openpgp.PGPKeyPair;
 import org.bouncycastle.openpgp.PGPObjectFactory;
 import org.bouncycastle.openpgp.PGPPrivateKey;
 import org.bouncycastle.openpgp.PGPPublicKey;
-import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSessionKey;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
 import org.bouncycastle.openpgp.operator.PBEDataDecryptorFactory;
@@ -49,12 +48,6 @@ import org.pgpainless.util.Passphrase;
 
 public class JceImplementationFactory extends ImplementationFactory {
 
-    public PBESecretKeyEncryptor getPBESecretKeyEncryptor(PGPSecretKey secretKey, Passphrase passphrase) {
-        return new JcePBESecretKeyEncryptorBuilder(secretKey.getKeyEncryptionAlgorithm())
-                .setProvider(ProviderFactory.getProvider())
-                .build(passphrase.getChars());
-    }
-
     public PBESecretKeyEncryptor getPBESecretKeyEncryptor(SymmetricKeyAlgorithm symmetricKeyAlgorithm, PGPDigestCalculator digestCalculator, Passphrase passphrase) {
         return new JcePBESecretKeyEncryptorBuilder(symmetricKeyAlgorithm.getAlgorithmId(), digestCalculator)
                 .setProvider(ProviderFactory.getProvider())