2 files changed, 6 insertions, 12 deletions
diff --git a/src/java/org/apache/poi/ss/usermodel/Font.java b/src/java/org/apache/poi/ss/usermodel/Font.java
index 4e95fb2751..60b8a91dc2 100644
--- a/src/java/org/apache/poi/ss/usermodel/Font.java
+++ b/src/java/org/apache/poi/ss/usermodel/Font.java
@@ -263,22 +263,24 @@ public interface Font {
     void setCharSet(int charset);
 
     /**
-     * Get the index within the XSSFWorkbook (sequence within the collection of Font objects)
+     * get the index within the XSSFWorkbook (sequence within the collection of Font objects)
      *
      * @return unique index number of the underlying record this Font represents (probably you don't care
      *  unless you're comparing which one is which)
-     * @deprecated use <code>getIndexAsInt()</code> instead
+     * @since 5.0.0 (used to return a short)
      */
-    @Removal(version = "4.2")
-    short getIndex();
+    int getIndex();
 
     /**
      * get the index within the XSSFWorkbook (sequence within the collection of Font objects)
      *
+     * @deprecated use {@link #getIndex()} instead
      * @return unique index number of the underlying record this Font represents (probably you don't care
      *  unless you're comparing which one is which)
      * @since 4.0.0
      */
+    @Deprecated
+    @Removal(version = "6.0.0")
     int getIndexAsInt();
 
     void setBold(boolean bold);
diff --git a/src/java/org/apache/poi/ss/util/ImageUtils.java b/src/java/org/apache/poi/ss/util/ImageUtils.java
index fdd8ee8965..d1c3a5f982 100644
--- a/src/java/org/apache/poi/ss/util/ImageUtils.java
+++ b/src/java/org/apache/poi/ss/util/ImageUtils.java
@@ -40,7 +40,6 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 import org.apache.poi.util.Units;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -48,13 +47,6 @@ import org.w3c.dom.NodeList;
 public final class ImageUtils {
     private static final POILogger logger = POILogFactory.getLogger(ImageUtils.class);
 
-    /**
-     * @deprecated use {@link Units#PIXEL_DPI}
-     */
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public static final int PIXEL_DPI = 96;
-
     private static final int WIDTH_UNITS = 1024;
     private static final int HEIGHT_UNITS = 256;