diff --git a/src/java/org/apache/poi/hssf/record/DBCellRecord.java b/src/java/org/apache/poi/hssf/record/DBCellRecord.java
index c4080f0ad..ddcc56fe8 100644
--- a/src/java/org/apache/poi/hssf/record/DBCellRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DBCellRecord.java
@@ -98,22 +98,6 @@ public final class DBCellRecord extends StandardRecord implements Cloneable {
     protected int getDataSize() {
         return 4 + field_2_cell_offsets.length * 2;
     }
-    
-    /**
-     * @param nBlocks number of blocks
-     * @param nRows number of rows
-     * 
-     * @return the size of the group of <tt>DBCellRecord</tt>s needed to encode
-     *         the specified number of blocks and rows
-     * 
-     * @deprecated in POI 3.15-beta2, scheduled for removal in POI 3.17 - this method is not used within POI
-     */
-    public static int calculateSizeOfRecords(int nBlocks, int nRows) {
-        // One DBCell per block.
-        // 8 bytes per DBCell (non variable section)
-        // 2 bytes per row reference
-        return nBlocks * 8 + nRows * 2;
-    }
 
     public short getSid() {
         return sid;
diff --git a/src/java/org/apache/poi/ss/format/CellFormat.java b/src/java/org/apache/poi/ss/format/CellFormat.java
index 76749b871..8f67164d7 100644
--- a/src/java/org/apache/poi/ss/format/CellFormat.java
+++ b/src/java/org/apache/poi/ss/format/CellFormat.java
@@ -37,6 +37,7 @@ import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.ss.util.DateFormatConverter;
 import org.apache.poi.util.LocaleUtil;
+import org.apache.poi.util.Removal;
 
 /**
  * Format a value according to the standard Excel behavior.  This "standard" is
@@ -123,6 +124,8 @@ public class CellFormat {
      * used when the format specified is <tt>General</tt>.
      * @deprecated use {@link #getInstance(Locale, String)} instead
      */
+    @Deprecated
+    @Removal(version="3.18")
     public static final CellFormat GENERAL_FORMAT = createGeneralFormat(LocaleUtil.getUserLocale());
             
     private static CellFormat createGeneralFormat(final Locale locale) {
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java b/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
index 334e841e4..0b924a66e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
+++ b/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
@@ -558,15 +558,6 @@ public class StylesTable extends POIXMLDocumentPart {
     public int getNumDataFormats() {
         return numberFormats.size();
     }
-    
-    /**
-     * For unit testing only
-     * @deprecated POI 3.14 beta 2. Use {@link #getNumDataFormats()} instead.
-     */
-    @Internal
-    public int _getNumberFormatSize() {
-        return getNumDataFormats();
-    }
 
     /**
      * For unit testing only