diff --git a/src/java/org/apache/poi/ddf/EscherContainerRecord.java b/src/java/org/apache/poi/ddf/EscherContainerRecord.java
index b09fb855c..82ae37481 100644
--- a/src/java/org/apache/poi/ddf/EscherContainerRecord.java
+++ b/src/java/org/apache/poi/ddf/EscherContainerRecord.java
@@ -27,7 +27,6 @@ import org.apache.poi.util.HexDump;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 /**
  * Escher container records store other escher records as children.
@@ -152,17 +151,6 @@ public final class EscherContainerRecord extends EscherRecord implements Iterabl
         return new ArrayList<EscherRecord>(_childRecords);
     }
 
-    /**
-     * @return an iterator over the child records
-     * @deprecated POI 3.16 beta 1. use iterator() or loop over the container record instead,
-     *     e.g. "for (EscherRecord r : container) ..."
-     */
-    @Removal(version="3.18")
-    @Deprecated
-    public Iterator<EscherRecord> getChildIterator() {
-        return iterator();
-    }
-
     /**
      * @return an iterator over the child records
      */
diff --git a/src/java/org/apache/poi/hpsf/VariantSupport.java b/src/java/org/apache/poi/hpsf/VariantSupport.java
index 61e6bb8db..373d5df39 100644
--- a/src/java/org/apache/poi/hpsf/VariantSupport.java
+++ b/src/java/org/apache/poi/hpsf/VariantSupport.java
@@ -25,13 +25,11 @@ import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.poi.util.CodePageUtil;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.LittleEndianByteArrayInputStream;
 import org.apache.poi.util.LittleEndianConsts;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 /**
  * Supports reading and writing of variant data.<p>
@@ -256,31 +254,6 @@ public class VariantSupport extends Variant {
         }
     }
 
-    /**
-     * Turns a codepage number into the equivalent character encoding's
-     * name.
-     *
-     * @param codepage The codepage number
-     *
-     * @return The character encoding's name. If the codepage number is 65001,
-     * the encoding name is "UTF-8". All other positive numbers are mapped to
-     * "cp" followed by the number, e.g. if the codepage number is 1252 the
-     * returned character encoding name will be "cp1252".
-     *
-     * @exception UnsupportedEncodingException if the specified codepage is
-     * less than zero.
-     *
-     * @deprecated POI 3.16 - use {@link CodePageUtil#codepageToEncoding(int)}
-     */
-    @Deprecated
-    @Removal(version="3.18")
-    public static String codepageToEncoding(final int codepage)
-    throws UnsupportedEncodingException
-    {
-        return CodePageUtil.codepageToEncoding(codepage);
-    }
-
-
     /**
      * Writes a variant value to an output stream. This method ensures that
      * always a multiple of 4 bytes is written.<p>
diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java b/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
index df216c071..3601e0102 100644
--- a/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
+++ b/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
@@ -16,8 +16,6 @@
 ==================================================================== */
 package org.apache.poi.poifs.crypt;
 
-import org.apache.poi.util.Removal;
-
 /**
  * Used when checking if a key is valid for a document 
  */
@@ -50,21 +48,6 @@ public abstract class EncryptionVerifier implements Cloneable {
         return spinCount;
     }
 
-    /**
-     * @deprecated POI 3.16 beta 1. use {@link #getChainingMode()}
-     */
-    @Removal(version="3.18")
-    public int getCipherMode() {
-        return chainingMode.ecmaId;
-    }
-
-    /**
-     * @deprecated POI 3.16 beta 1. use {@link #getCipherAlgorithm()}
-     */
-    public int getAlgorithm() {
-        return cipherAlgorithm.ecmaId;
-    }
-
     public byte[] getEncryptedKey() {
         return encryptedKey;
     }