diff --git a/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/AsposeDocFactory.java b/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/AsposeDocFactory.java
index b8b3b1dc..143a27c9 100644
--- a/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/AsposeDocFactory.java
+++ b/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/AsposeDocFactory.java
@@ -1405,36 +1405,6 @@ protected <T> T getFieldMergingCallBack() {
     return (T) this.fieldMergingCallback;
   }
 
-  /**
-   * Sets the AsposeFieldMergingCallback object used to apply special rules to
-   * merge fields while performing the mail merge operation.<br>
-   * <br>
-   * A typical use of FieldMergingCallback objects is to insert images in merge
-   * fields if these merge fields name are declared as "Image:fieldName". In
-   * such a case the merge-field-value corresponding to this field can be a
-   * String (path of the image file) or the images itself as ByteArray.<br>
-   * <br>
-   * You can provide your own AsposeFieldMergingCallback object that covers your
-   * special needs. For example, you should override the <br>
-   * {@code public void fieldMerging(FieldMergingArgs arg0)}<br>
-   * method to apply special rules to HTML merge fields. See
-   * www.aspose.com/community/forums/thread/380671/html-text-with-merge-field.aspx
-   * @param fieldMergingCallback
-   * @throws IllegalArgumentException if the parameter is null.
-   * @deprecated use the {@link BaseDocFactory#getInstance()} for instantiating
-   *             the DocFactory and the
-   *             {@link BaseDocFactory#withFieldMergingCallBack(Object)} for
-   *             setting its fieldMergingCallback
-   */
-  @Deprecated
-  public void setAsposeFieldMergingCallback(AsposeFieldMergingCallback fieldMergingCallback)
-          throws IllegalArgumentException {
-    if (fieldMergingCallback == null) {
-      throw new IllegalArgumentException("The AsposeFieldMergingCallback must not be null.");
-    }
-    this.fieldMergingCallback = fieldMergingCallback;
-  }
-
   private SimpleMergeCleanupOptions simpleMergeCleanupOptions = SimpleMergeCleanupOptions
           .getRecommendedMergeCleanupOptionsForSimpleMerging();
   private MergeCleanupOptions regionMergeCleanupOptions = MergeCleanupOptions
diff --git a/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/BaseDocFactory.java b/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/BaseDocFactory.java
index 3976101a..5fa927fe 100644
--- a/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/BaseDocFactory.java
+++ b/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/BaseDocFactory.java
@@ -46,10 +46,6 @@ public abstract class BaseDocFactory {
   public static final String[] SUPPORTED_OUTPUT_FORMATS = new String[] {"doc", "docx", "html", "txt", "pdf",
       "odt"};
 
-  @Deprecated
-  public static final String[] supportedOutputFormats = new String[] {"doc", "docx", "html", "txt", "pdf",
-      "odt"};
-
   /* Format types for convenient use of switch control */
   public static final int UNSUPPORTED_FORMAT = DocFactoryConstants.UNSUPPORTED_FORMAT;
   public static final int DOC_FORMAT = DocFactoryConstants.DOC_FORMAT;
@@ -588,17 +584,6 @@ protected ResponseHandler getResponsHandler() {
 
   protected Object fieldMergingCallback;
 
-  /**
-   * @deprecated Deprecated because of typo in method name. Please use
-   *             {@link #withFieldMergingCallBack(Object)} instead. Will be
-   *             removed in the future.
-   * @param callback
-   */
-  @Deprecated
-  public <T> BaseDocFactory withFielMergingCallBack(T callback) {
-    return this.withFieldMergingCallBack(callback);
-  }
-
   /**
    * Some DocFactory may allow injecting its own FieldMerging plug-in class for
    * performing mail merging. A good example is the
diff --git a/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/DocumentTemplate.java b/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/DocumentTemplate.java
index eae4b225..da36f307 100644
--- a/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/DocumentTemplate.java
+++ b/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/DocumentTemplate.java
@@ -808,19 +808,6 @@ public FileOperationMessage getFileOperationMessage() {
     return fileOperationMessage;
   }
 
-  /**
-   * set the fileOperationMessage Object of the DocumentTemplate.<br>
-   * There should be no reason to use this method, since the
-   * fileOperationMessage is the result of the generateDocument() method.
-   * @param _fop the fileOperationMessage
-   */
-  @Deprecated
-  public void setFileOperationMessage(FileOperationMessage _fop) {
-    if (_fop != null) {
-      this.fileOperationMessage = _fop;
-    }
-  }
-
   /**
    * set the tableNames/Fields values HashMap Object. It clears also the
    * tableNames/Fields values java.util.Hashtable object, <br>
diff --git a/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/options/DocumentCreationOptions.java b/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/options/DocumentCreationOptions.java
index 83689201..dcf97779 100644
--- a/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/options/DocumentCreationOptions.java
+++ b/doc-factory/src/ch/ivyteam/ivy/addons/docfactory/options/DocumentCreationOptions.java
@@ -26,17 +26,6 @@ public DocumentCreationOptions withPdfOptions(PdfOptions options) {
     return this;
   }
 
-  /**
-   * @deprecated use {@link #withPdfOptions(PdfOptions)} instead. The
-   *             {@link PdfOptions} contains this option now.
-   */
-  @Deprecated
-  public DocumentCreationOptions removeWhiteSpaceInPdfEditableFields(
-          boolean removeWhiteSpaceInPdfEditableFields) {
-    pdfOptions.setRemoveWhiteSpaceInPdfEditableFields(removeWhiteSpaceInPdfEditableFields);
-    return this;
-  }
-
   public DocumentCreationOptions displayBooleanValuesAsCheckBox(boolean checkbox) {
     this.displayBooleanValuesAsCheckBox = checkbox;
     return this;
@@ -64,43 +53,6 @@ public void setRemoveBlankPages(boolean removeBlankPages) {
     this.removeBlankPages = removeBlankPages;
   }
 
-  /**
-   * @deprecated use {@link #withPdfOptions(PdfOptions)} instead. The
-   *             {@link PdfOptions} contains this option now.
-   */
-  @Deprecated
-  public boolean isRemoveWhiteSpaceInPdfEditableFields() {
-    return pdfOptions.isRemoveWhiteSpaceInPdfEditableFields();
-  }
-
-  /**
-   * @deprecated use {@link #withPdfOptions(PdfOptions)} instead. The
-   *             {@link PdfOptions} contains this option now.
-   */
-  @Deprecated
-  public void setRemoveWhiteSpaceInPdfEditableFields(
-          boolean removeWhiteSpaceInPdfEditableFields) {
-    this.pdfOptions.setRemoveWhiteSpaceInPdfEditableFields(removeWhiteSpaceInPdfEditableFields);
-  }
-
-  /**
-   * @deprecated use {@link #withPdfOptions(PdfOptions)} instead. The
-   *             {@link PdfOptions} contains this option now.
-   */
-  @Deprecated
-  public boolean isKeepFormFieldsEditableInPdf() {
-    return pdfOptions.isKeepFormFieldsEditableInPdf();
-  }
-
-  /**
-   * @deprecated use {@link #withPdfOptions(PdfOptions)} instead. The
-   *             {@link PdfOptions} contains this option now.
-   */
-  @Deprecated
-  public void setKeepFormFieldsEditableInPdf(boolean keepFormFieldsEditable) {
-    this.pdfOptions.setKeepFormFieldsEditableInPdf(keepFormFieldsEditable);
-  }
-
   public PdfOptions getPdfOptions() {
     return this.pdfOptions;
   }