diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
index d7c4b675c..312584e3e 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java
@@ -2,22 +2,25 @@ package stirling.software.SPDF.controller.api.security;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.List;
 
 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.apache.pdfbox.pdmodel.PDDocumentNameDictionary;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageTree;
-import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
 import org.apache.pdfbox.pdmodel.interactive.action.PDAction;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionLaunch;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
+import org.apache.pdfbox.pdmodel.interactive.action.PDDocumentCatalogAdditionalActions;
 import org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
+import org.apache.pdfbox.pdmodel.interactive.action.PDPageAdditionalActions;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationFileAttachment;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationLink;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
@@ -34,6 +37,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.SPDF.model.api.security.SanitizePdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
@@ -43,6 +47,7 @@ import stirling.software.common.util.WebResponseUtils;
 @RestController
 @RequestMapping("/api/v1/security")
 @Tag(name = "Security", description = "Security APIs")
+@Slf4j
 @RequiredArgsConstructor
 public class SanitizeController {
 
@@ -99,7 +104,7 @@ public class SanitizeController {
                 GeneralUtils.generateFilename(inputFile.getOriginalFilename(), "_sanitized.pdf"));
     }
 
-    private void sanitizeJavaScript(PDDocument document) throws IOException {
+    private static void sanitizeJavaScript(PDDocument document) throws IOException {
         // Get the root dictionary (catalog) of the PDF
         PDDocumentCatalog catalog = document.getDocumentCatalog();
 
@@ -118,7 +123,61 @@ public class SanitizeController {
             }
         }
 
+        if (catalog.getOpenAction() instanceof PDActionJavaScript) {
+            catalog.setOpenAction(null);
+        }
+
+        PDDocumentCatalogAdditionalActions catalogActions = catalog.getActions();
+        if (catalogActions != null) {
+            if (catalogActions.getWC() instanceof PDActionJavaScript) {
+                catalogActions.setWC(null);
+            }
+            if (catalogActions.getWS() instanceof PDActionJavaScript) {
+                catalogActions.setWS(null);
+            }
+            if (catalogActions.getDS() instanceof PDActionJavaScript) {
+                catalogActions.setDS(null);
+            }
+            if (catalogActions.getWP() instanceof PDActionJavaScript) {
+                catalogActions.setWP(null);
+            }
+            if (catalogActions.getDP() instanceof PDActionJavaScript) {
+                catalogActions.setDP(null);
+            }
+        }
+
+        PDAcroForm acroForm = catalog.getAcroForm();
+        if (acroForm != null) {
+            for (PDField field : acroForm.getFields()) {
+                PDFormFieldAdditionalActions actions = field.getActions();
+                if (actions != null) {
+                    if (actions.getC() instanceof PDActionJavaScript) {
+                        actions.setC(null);
+                    }
+                    if (actions.getF() instanceof PDActionJavaScript) {
+                        actions.setF(null);
+                    }
+                    if (actions.getK() instanceof PDActionJavaScript) {
+                        actions.setK(null);
+                    }
+                    if (actions.getV() instanceof PDActionJavaScript) {
+                        actions.setV(null);
+                    }
+                }
+            }
+        }
+
         for (PDPage page : document.getPages()) {
+            PDPageAdditionalActions pageActions = page.getActions();
+            if (pageActions != null) {
+                if (pageActions.getO() instanceof PDActionJavaScript) {
+                    pageActions.setO(null);
+                }
+                if (pageActions.getC() instanceof PDActionJavaScript) {
+                    pageActions.setC(null);
+                }
+            }
+
             for (PDAnnotation annotation : page.getAnnotations()) {
                 if (annotation instanceof PDAnnotationWidget widget) {
                     PDAction action = widget.getAction();
@@ -127,41 +186,26 @@ public class SanitizeController {
                     }
                 }
             }
-            PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
-            if (acroForm != null) {
-                for (PDField field : acroForm.getFields()) {
-                    PDFormFieldAdditionalActions actions = field.getActions();
-                    if (actions != null) {
-                        if (actions.getC() instanceof PDActionJavaScript) {
-                            actions.setC(null);
-                        }
-                        if (actions.getF() instanceof PDActionJavaScript) {
-                            actions.setF(null);
-                        }
-                        if (actions.getK() instanceof PDActionJavaScript) {
-                            actions.setK(null);
-                        }
-                        if (actions.getV() instanceof PDActionJavaScript) {
-                            actions.setV(null);
-                        }
-                    }
-                }
+        }
+    }
+
+    private static void sanitizeEmbeddedFiles(PDDocument document) throws IOException {
+        PDDocumentCatalog catalog = document.getDocumentCatalog();
+        PDDocumentNameDictionary names = catalog.getNames();
+        if (names != null) {
+            names.setEmbeddedFiles(null);
+        }
+
+        for (PDPage page : document.getPages()) {
+            List<PDAnnotation> annotations = page.getAnnotations();
+            if (annotations != null && !annotations.isEmpty()) {
+                annotations.removeIf(
+                        annotation -> annotation instanceof PDAnnotationFileAttachment);
             }
         }
     }
 
-    private void sanitizeEmbeddedFiles(PDDocument document) {
-        PDPageTree allPages = document.getPages();
-
-        for (PDPage page : allPages) {
-            PDResources res = page.getResources();
-            if (res != null && res.getCOSObject() != null) {
-                res.getCOSObject().removeItem(COSName.getPDFName("EmbeddedFiles"));
-            }
-        }
-    }
-
-    private void sanitizeXMPMetadata(PDDocument document) {
+    private static void sanitizeXMPMetadata(PDDocument document) {
         if (document.getDocumentCatalog() != null) {
             PDMetadata metadata = document.getDocumentCatalog().getMetadata();
             if (metadata != null) {
@@ -170,7 +214,7 @@ public class SanitizeController {
         }
     }
 
-    private void sanitizeDocumentInfoMetadata(PDDocument document) {
+    private static void sanitizeDocumentInfoMetadata(PDDocument document) {
         PDDocumentInformation docInfo = document.getDocumentInformation();
         if (docInfo != null) {
             PDDocumentInformation newInfo = new PDDocumentInformation();
@@ -178,7 +222,7 @@ public class SanitizeController {
         }
     }
 
-    private void sanitizeLinks(PDDocument document) throws IOException {
+    private static void sanitizeLinks(PDDocument document) throws IOException {
         for (PDPage page : document.getPages()) {
             for (PDAnnotation annotation : page.getAnnotations()) {
                 if (annotation instanceof PDAnnotationLink linkAnnotation) {
@@ -191,7 +235,7 @@ public class SanitizeController {
         }
     }
 
-    private void sanitizeFonts(PDDocument document) {
+    private static void sanitizeFonts(PDDocument document) {
         for (PDPage page : document.getPages()) {
             if (page != null
                     && page.getResources() != null