Index: src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
===================================================================
--- src/java/org/apache/poi/hssf/usermodel/HSSFCell.java	(revision 1800374)
+++ src/java/org/apache/poi/hssf/usermodel/HSSFCell.java	(working copy)
@@ -53,7 +53,6 @@
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellReference;
 import org.apache.poi.ss.util.NumberToTextConverter;
-import org.apache.poi.util.Internal;
 import org.apache.poi.util.LocaleUtil;
 
 /**
@@ -1145,25 +1144,9 @@
 
     /**
      * Only valid for formula cells
-     * 
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     * 
      * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
      *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
      * on the cached value of the formula
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Override
-    public int getCachedFormulaResultType() {
-        return getCachedFormulaResultTypeEnum().getCode();
-    }
-
-    /**
-     * Only valid for formula cells
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
      * @since POI 3.15 beta 3
      * Will be deleted when we make the CellType enum transition. See bug 59791.
      */
Index: src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
===================================================================
--- src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java	(revision 1800374)
+++ src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java	(working copy)
@@ -94,17 +94,6 @@
 		return _cell.getRichStringCellValue().getString();
 	}
 	/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type of cached formula result
-	 * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-	 */
-	@Override
-	public int getCachedFormulaResultType() {
-		return _cell.getCachedFormulaResultType();
-	}
-	/**
 	 * @since POI 3.15 beta 3
 	 * @deprecated POI 3.15 beta 3.
 	 * Will be deleted when we make the CellType enum transition. See bug 59791.
Index: src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
===================================================================
--- src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java	(revision 1800374)
+++ src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java	(working copy)
@@ -142,27 +142,6 @@
     }
 
     protected abstract CellValue evaluateFormulaCellValue(Cell cell);
-
-    /**
-     * If cell contains formula, it evaluates the formula, and saves the result of the formula. The
-     * cell remains as a formula cell. If the cell does not contain formula, this method returns -1
-     * and leaves the cell unchanged.
-     *
-     * Note that the type of the <em>formula result</em> is returned, so you know what kind of
-     * cached formula result is also stored with  the formula.
-     * <pre>
-     * int evaluatedCellType = evaluator.evaluateFormulaCell(cell);
-     * </pre>
-     * Be aware that your cell will hold both the formula, and the result. If you want the cell
-     * replaced with the result of the formula, use {@link #evaluateInCell(org.apache.poi.ss.usermodel.Cell)}
-     * @param cell The cell to evaluate
-     * @return -1 for non-formula cells, or the type of the <em>formula result</em>
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Override
-    public int evaluateFormulaCell(Cell cell) {
-        return evaluateFormulaCellEnum(cell).getCode();
-    }
     
     /**
      * If cell contains formula, it evaluates the formula,
Index: src/java/org/apache/poi/ss/formula/EvaluationCell.java
===================================================================
--- src/java/org/apache/poi/ss/formula/EvaluationCell.java	(revision 1800374)
+++ src/java/org/apache/poi/ss/formula/EvaluationCell.java	(working copy)
@@ -58,14 +58,6 @@
 	int getErrorCellValue();
 
 	/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type of cached formula result
-	 * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-	 */
-	int getCachedFormulaResultType();
-	/**
 	 * @since POI 3.15 beta 3
 	 * @deprecated POI 3.15 beta 3.
 	 * Will be deleted when we make the CellType enum transition. See bug 59791.
Index: src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
===================================================================
--- src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java	(revision 1800374)
+++ src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java	(working copy)
@@ -155,17 +155,6 @@
 		return _masterCell.getColumnIndex();
 	}
 	/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type of cached formula result
-	 * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-	 */
-	@Override
-	public int getCachedFormulaResultType() {
-		return _masterCell.getCachedFormulaResultType();
-	}
-	/**
 	 * @since POI 3.15 beta 3
 	 * @deprecated POI 3.15 beta 3.
 	 * Will be deleted when we make the CellType enum transition. See bug 59791.
Index: src/java/org/apache/poi/ss/usermodel/Cell.java
===================================================================
--- src/java/org/apache/poi/ss/usermodel/Cell.java	(revision 1800374)
+++ src/java/org/apache/poi/ss/usermodel/Cell.java	(working copy)
@@ -188,20 +188,6 @@
      */
     @Removal(version="4.2")
     CellType getCellTypeEnum();
-    
-    /**
-     * Only valid for formula cells
-     * 
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     * 
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Deprecated
-    int getCachedFormulaResultType();
 
     /**
      * Only valid for formula cells
Index: src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
===================================================================
--- src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java	(revision 1800374)
+++ src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java	(working copy)
@@ -77,31 +77,6 @@
      * @param cell
      */
     CellValue evaluate(Cell cell);
-
-
-    /**
-     * If cell contains formula, it evaluates the formula,
-     *  and saves the result of the formula. The cell
-     *  remains as a formula cell.
-     * Else if cell does not contain formula, this method leaves
-     *  the cell unchanged.
-     * Note that the type of the formula result is returned,
-     *  so you know what kind of value is also stored with
-     *  the formula.
-     * <pre>
-     * int evaluatedCellType = evaluator.evaluateFormulaCell(cell);
-     * </pre>
-     * Be aware that your cell will hold both the formula,
-     *  and the result. If you want the cell replaced with
-     *  the result of the formula, use {@link #evaluateInCell(Cell)}
-     * @param cell The cell to evaluate
-     * @return The type of the formula result, i.e. -1 if the cell is not a formula, 
-     *      or one of {@link CellType#NUMERIC}, {@link CellType#STRING},
-     *      {@link CellType#BOOLEAN}, {@link CellType#ERROR}
-     *      Note: the cell's type remains as CellType.FORMULA however.
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future
-     */
-    int evaluateFormulaCell(Cell cell);
     
     /**
      * If cell contains formula, it evaluates the formula,
Index: src/java/org/apache/poi/ss/util/SheetUtil.java
===================================================================
--- src/java/org/apache/poi/ss/util/SheetUtil.java	(revision 1800374)
+++ src/java/org/apache/poi/ss/util/SheetUtil.java	(working copy)
@@ -68,7 +68,7 @@
      *
      *  See Bugzilla #50021
      */
-    private static final FormulaEvaluator dummyEvaluator = new FormulaEvaluator(){
+    private static final FormulaEvaluator dummyEvaluator = new FormulaEvaluator() {
         @Override
         public void clearAllCachedResultValues(){}
         @Override
@@ -89,11 +89,6 @@
         public void setIgnoreMissingWorkbooks(boolean ignore) {}
         @Override
         public void evaluateAll() {}
-        @Override
-        public int evaluateFormulaCell(Cell cell) {
-            //noinspection deprecation
-            return cell.getCachedFormulaResultType();
-        }
         /** 
          * @since POI 3.15 beta 3
          * @deprecated POI 3.15 beta 3. Will be deleted when we make the CellType enum transition. See bug 59791.
Index: src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
===================================================================
--- src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java	(revision 1800374)
+++ src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java	(working copy)
@@ -175,19 +175,6 @@
      * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
      *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
      * on the cached value of the formula
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Override
-    public int getCachedFormulaResultType()
-    {
-        return getCachedFormulaResultTypeEnum().getCode();
-    }
-
-    /**
-     * Only valid for formula cells
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
      * @since POI 3.15 beta 3
      * Will be deleted when we make the CellType enum transition. See bug 59791.
      */
Index: src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
===================================================================
--- src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java	(revision 1800374)
+++ src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java	(working copy)
@@ -97,16 +97,6 @@
         return _cell.getRichStringCellValue().getString();
     }
     /**
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     *
-     * @return cell type of cached formula result
-     */
-    @Override
-    public int getCachedFormulaResultType() {
-        return _cell.getCachedFormulaResultType();
-    }
-    /**
      * @since POI 3.15 beta 3
      * @deprecated POI 3.15 beta 3.
      * Will be deleted when we make the CellType enum transition. See bug 59791.
Index: src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
===================================================================
--- src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java	(revision 1800374)
+++ src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java	(working copy)
@@ -708,24 +708,6 @@
 
         return getBaseCellType(true);
     }
-
-    /**
-     * Only valid for formula cells
-     * 
-     * Will return {@link CellType} in a future version of POI.
-     * For forwards compatibility, do not hard-code cell type literals in your code.
-     * 
-     * @return one of ({@link CellType#NUMERIC}, {@link CellType#STRING},
-     *     {@link CellType#BOOLEAN}, {@link CellType#ERROR}) depending
-     * on the cached value of the formula
-     * @deprecated 3.15. Will return a {@link CellType} enum in the future.
-     */
-    @Deprecated
-    @Override
-    @Removal(version="3.17")
-    public int getCachedFormulaResultType() {
-        return getCachedFormulaResultTypeEnum().getCode();
-    }
     
     /**
      * Only valid for formula cells
Index: src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
===================================================================
--- src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java	(revision 1800374)
+++ src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java	(working copy)
@@ -98,16 +98,6 @@
 		return _cell.getRichStringCellValue().getString();
 	}
 	/**
-	 * Will return {@link CellType} in a future version of POI.
-	 * For forwards compatibility, do not hard-code cell type literals in your code.
-	 *
-	 * @return cell type of cached formula result
-	 */
-	@Override
-	public int getCachedFormulaResultType() {
-		return _cell.getCachedFormulaResultType();
-	}
-	/**
 	 * @since POI 3.15 beta 3
 	 * @deprecated POI 3.15 beta 3.
 	 * Will be deleted when we make the CellType enum transition. See bug 59791.