diff --git a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionResult.java b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionResult.java
index d1bc3d7f..10342a3c 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionResult.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionResult.java
@@ -51,6 +51,8 @@ public final class EncryptionResult {
      * @return symmetric encryption algorithm
      *
      * @deprecated use {@link #getEncryptionAlgorithm()} instead.
+     *
+     * TODO: Remove in 1.2.X
      */
     @Deprecated
     public SymmetricKeyAlgorithm getSymmetricKeyAlgorithm() {
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/protection/SecretKeyRingProtector.java b/pgpainless-core/src/main/java/org/pgpainless/key/protection/SecretKeyRingProtector.java
index 2709b143..84f47155 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/protection/SecretKeyRingProtector.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/protection/SecretKeyRingProtector.java
@@ -77,6 +77,8 @@ public interface SecretKeyRingProtector {
      * @param keys key ring
      * @return protector
      * @deprecated use {@link #unlockEachKeyWith(Passphrase, PGPSecretKeyRing)} instead.
+     *
+     * TODO: Remove in 1.2.X
      */
     @Deprecated
     static SecretKeyRingProtector unlockAllKeysWith(@Nonnull Passphrase passphrase, @Nonnull PGPSecretKeyRing keys) {
diff --git a/pgpainless-core/src/main/java/org/pgpainless/key/util/KeyRingUtils.java b/pgpainless-core/src/main/java/org/pgpainless/key/util/KeyRingUtils.java
index 0fe6df89..f64133b0 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/key/util/KeyRingUtils.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/key/util/KeyRingUtils.java
@@ -385,6 +385,7 @@ public final class KeyRingUtils {
             // TODO: Replace with PGPSecretKeyRing.insertOrReplacePublicKey() once available
             //  Right now replacePublicKeys looses extra public keys.
             //  See https://github.com/bcgit/bc-java/pull/1068 for a possible fix
+            //  Fix once BC 171 gets released.
             secretKeys = PGPSecretKeyRing.replacePublicKeys(secretKeys, publicKeys);
             return (T) secretKeys;
         }
diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/DetachedSignatureCheck.java b/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/DetachedSignatureCheck.java
index 1f6114bb..a431c5de 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/DetachedSignatureCheck.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/DetachedSignatureCheck.java
@@ -63,6 +63,8 @@ public class DetachedSignatureCheck {
      *
      * @return fingerprint of the signing key
      * @deprecated use {@link #getSigningKeyIdentifier()} instead.
+     *
+     * TODO: Remove in 1.2.X
      */
     @Deprecated
     public OpenPgpFingerprint getFingerprint() {
diff --git a/pgpainless-core/src/main/java/org/pgpainless/util/ArmorUtils.java b/pgpainless-core/src/main/java/org/pgpainless/util/ArmorUtils.java
index 8e93ce6d..1d3c17cc 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/util/ArmorUtils.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/util/ArmorUtils.java
@@ -280,6 +280,8 @@ public final class ArmorUtils {
      * @return armored output stream
      *
      * @deprecated use {@link #toAsciiArmoredStream(PGPKeyRing, OutputStream)} instead
+     *
+     * TODO: Remove in 1.2.X
      */
     @Deprecated
     @Nonnull