diff --git a/src/main/java/stirling/software/SPDF/config/Beans.java b/src/main/java/stirling/software/SPDF/config/Beans.java
index f821bb070..3354da0de 100644
--- a/src/main/java/stirling/software/SPDF/config/Beans.java
+++ b/src/main/java/stirling/software/SPDF/config/Beans.java
@@ -1,5 +1,7 @@
 package stirling.software.SPDF.config;
 
+import java.util.Locale;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.LocaleResolver;
@@ -8,8 +10,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
-import java.util.Locale;
-
 @Configuration
 public class Beans implements WebMvcConfigurer {
 
diff --git a/src/main/java/stirling/software/SPDF/controller/CompressController.java b/src/main/java/stirling/software/SPDF/controller/CompressController.java
index 6b06a5ef1..8b8de5d8d 100644
--- a/src/main/java/stirling/software/SPDF/controller/CompressController.java
+++ b/src/main/java/stirling/software/SPDF/controller/CompressController.java
@@ -1,15 +1,9 @@
 package stirling.software.SPDF.controller;
 
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.apache.pdfbox.pdmodel.PDDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/src/main/java/stirling/software/SPDF/controller/OverlayImageController.java b/src/main/java/stirling/software/SPDF/controller/OverlayImageController.java
index 281b9112f..ccffe2e64 100644
--- a/src/main/java/stirling/software/SPDF/controller/OverlayImageController.java
+++ b/src/main/java/stirling/software/SPDF/controller/OverlayImageController.java
@@ -4,9 +4,7 @@ import java.io.IOException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/src/main/java/stirling/software/SPDF/controller/PdfController.java b/src/main/java/stirling/software/SPDF/controller/PdfController.java
index 3973c603f..1f50a4de9 100644
--- a/src/main/java/stirling/software/SPDF/controller/PdfController.java
+++ b/src/main/java/stirling/software/SPDF/controller/PdfController.java
@@ -1,25 +1,10 @@
 package stirling.software.SPDF.controller;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.core.io.InputStreamResource;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
 
 @Controller
 public class PdfController {
diff --git a/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java b/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java
index 90fbf118c..6de2b32a9 100644
--- a/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java
@@ -1,6 +1,5 @@
 package stirling.software.SPDF.controller;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -9,9 +8,6 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -60,7 +56,7 @@ public class RearrangePagesPDFController {
 	}
 
 	private List<Integer> pageOrderToString(String[] pageOrderArr, int totalPages) {
-		List<Integer> newPageOrder = new ArrayList<Integer>();
+		List<Integer> newPageOrder = new ArrayList<>();
 		// loop through the page order array
 		for (String element : pageOrderArr) {
 			// check if the element contains a range of pages
diff --git a/src/main/java/stirling/software/SPDF/controller/RotationController.java b/src/main/java/stirling/software/SPDF/controller/RotationController.java
index 436dc4842..0d02eb027 100644
--- a/src/main/java/stirling/software/SPDF/controller/RotationController.java
+++ b/src/main/java/stirling/software/SPDF/controller/RotationController.java
@@ -1,19 +1,12 @@
 package stirling.software.SPDF.controller;
 
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Iterator;
-import java.util.ListIterator;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -45,11 +38,7 @@ public class RotationController {
 		// Get the list of pages in the document
 		PDPageTree pages = document.getPages();
 
-		// Rotate all pages by the specified angle
-		Iterator<PDPage> iterPage = pages.iterator();
-
-		while (iterPage.hasNext()) {
-			PDPage page = iterPage.next();
+		for (PDPage page : pages) {
 			page.setRotation(page.getRotation() + angle);
 		}
 
diff --git a/src/main/java/stirling/software/SPDF/controller/converters/ConvertImgPDFController.java b/src/main/java/stirling/software/SPDF/controller/converters/ConvertImgPDFController.java
index b34c24ed3..9149948b4 100644
--- a/src/main/java/stirling/software/SPDF/controller/converters/ConvertImgPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/converters/ConvertImgPDFController.java
@@ -1,6 +1,5 @@
 package stirling.software.SPDF.controller.converters;
 
-import java.io.File;
 import java.io.IOException;
 
 import org.apache.pdfbox.rendering.ImageType;
diff --git a/src/main/java/stirling/software/SPDF/controller/security/MetadataController.java b/src/main/java/stirling/software/SPDF/controller/security/MetadataController.java
index a4bf9535c..d6cc4d079 100644
--- a/src/main/java/stirling/software/SPDF/controller/security/MetadataController.java
+++ b/src/main/java/stirling/software/SPDF/controller/security/MetadataController.java
@@ -1,34 +1,15 @@
 package stirling.software.SPDF.controller.security;
 
-import java.awt.Color;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.PDDocumentInformation;
-import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.pdmodel.common.PDMetadata;
-import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
-import org.apache.pdfbox.util.Matrix;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import jakarta.servlet.http.HttpServletRequest;
-import stirling.software.SPDF.utils.PdfUtils;
 
 @Controller
 public class MetadataController {
@@ -57,30 +38,30 @@ public class MetadataController {
 //	  for(Entry entry : allRequestParams.entrySet()) {
 //		  System.out.println("1 key=" + entry.getKey() + ", value=" + entry.getValue());
 //	  }
-//		
-//	  
+//
+//
 //	  System.out.println("request.getParameterMap().size() = " + request.getParameterMap().size());
 //	  for(Entry entry : request.getParameterMap().entrySet()) {
 //		  System.out.println("2 key=" + entry.getKey() + ", value=" + entry.getValue());
 //	  }
-//	 
-//	  
+//
+//
 //	  System.out.println("mdoel.size() = " + model.size());
 //	  for(Entry entry :  model.entrySet()) {
 //		  System.out.println("3 key=" + entry.getKey() + ", value=" + entry.getValue());
 //	  }
-//	  
+//
 //	  PDDocument document = PDDocument.load(pdfFile.getBytes());
 //
-//	  
+//
 //	  // Remove all metadata based on flag
 //	  PDDocumentInformation info = document.getDocumentInformation();
 //	  for (String key : info.getMetadataKeys()) {
 //	    info.setCustomMetadataValue(key, null);
 //	  }
 //
-//	  
-//	
+//
+//
 //
 //	  return PdfUtils.pdfDocToWebResponse(document, pdfFile.getName() + "_metadata.pdf");
 //	}
diff --git a/src/main/java/stirling/software/SPDF/controller/security/PasswordController.java b/src/main/java/stirling/software/SPDF/controller/security/PasswordController.java
index 1d7a79c51..d23bf1bf8 100644
--- a/src/main/java/stirling/software/SPDF/controller/security/PasswordController.java
+++ b/src/main/java/stirling/software/SPDF/controller/security/PasswordController.java
@@ -1,18 +1,12 @@
 package stirling.software.SPDF.controller.security;
 
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
-import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
 import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/src/main/java/stirling/software/SPDF/controller/security/WatermarkController.java b/src/main/java/stirling/software/SPDF/controller/security/WatermarkController.java
index 6fd2c8cb0..c747e2c8b 100644
--- a/src/main/java/stirling/software/SPDF/controller/security/WatermarkController.java
+++ b/src/main/java/stirling/software/SPDF/controller/security/WatermarkController.java
@@ -1,7 +1,6 @@
 package stirling.software.SPDF.controller.security;
 
 import java.awt.Color;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -9,11 +8,7 @@ import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
-import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
 import org.apache.pdfbox.util.Matrix;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java
index 495c6986d..54ba54f39 100644
--- a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java
+++ b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java
@@ -11,20 +11,18 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import javax.imageio.ImageIO;
+
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;