diff --git a/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java b/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
index fedd27acac..8578a8333f 100644
--- a/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
+++ b/src/ooxml/java/org/apache/poi/POIXMLTypeLoader.java
@@ -97,26 +97,6 @@ public class POIXMLTypeLoader {
     private static XmlOptions getXmlOptions(XmlOptions options) {
         return options == null ? DEFAULT_XML_OPTIONS : options;
     }
-
-    /**
-     * Sets the {@link ClassLoader} which is used, when XmlBeans are dynamically instantiated -
-     * opposed to being loaded by the factory class which is accompanied by each generated XmlBeans interface.
-     * <p>
-     * This is especially necessary in a context which doesn't guarantee that the current (thread) context
-     * classloader has access to all XmlBeans schema definitions (*.xsb) - which is typically in OSGI the case.
-     * <p>
-     * The classloader will be only set for the current thread in a {@link ThreadLocal}. Although the
-     * ThreadLocal is implemented via a {@link WeakReference}, it's good style to {@code null} the classloader
-     * when the user code is finalized.
-     * 
-     * @param cl the classloader to be used when XmlBeans classes and definitions are looked up
-     * @deprecated in POI 3.17 - setting a classloader from the outside is now obsolete,
-     *  the classloader of the SchemaType will be used
-     */
-    @Deprecated
-    @Removal(version="4.0")
-    public static void setClassLoader(ClassLoader cl) {
-    }
     
     private static SchemaTypeLoader getTypeLoader(SchemaType type) {
         SchemaTypeLoader tl = typeLoader.get();
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
index 86b81d682a..ba9fe227d8 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
@@ -71,8 +71,7 @@ public class XSLFTable extends XSLFGraphicFrame implements Iterable<XSLFTableRow
                 String errStr =
                     "Schemas (*.xsb) for CTTable can't be loaded - usually this happens when OSGI " +
                     "loading is used and the thread context classloader has no reference to " +
-                    "the xmlbeans classes - use POIXMLTypeLoader.setClassLoader() to set the loader, " +
-                    "e.g. with CTTable.class.getClassLoader()"
+                    "the xmlbeans classes"
                 ;
                 throw new IllegalStateException(errStr);
             }
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
index df49cc94c0..fcbd85b231 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
@@ -301,17 +301,6 @@ public final class XSSFChart extends XDDFChart implements Chart, ChartAxisFactor
 		return new XSSFRichTextString(text.toString());
 	}
 
-	/**
-	 * Sets the title text as a static string.
-	 * @param newTitle to use
-	 * @deprecated POI 3.16, use {@link #setTitleText(String)} instead.
-	 */
-    @Deprecated
-    @Removal(version = "4.0")
-    public void setTitle(String newTitle) {
-
-    }
-
     /**
      * Sets the title text as a static string.
      *
@@ -342,8 +331,7 @@ public final class XSSFChart extends XDDFChart implements Chart, ChartAxisFactor
             rich = tx.getRich();
         } else {
             rich = tx.addNewRich();
-            rich.addNewBodyPr(); // body properties must exist (but can be
-                                 // empty)
+            rich.addNewBodyPr(); // body properties must exist (but can be empty)
         }
 
         CTTextParagraph para;