diff --git a/dom/src/main/java/org/apache/james/mime4j/internal/AbstractEntityBuilder.java b/dom/src/main/java/org/apache/james/mime4j/internal/AbstractEntityBuilder.java
index 5561c5ad..5b83625b 100644
--- a/dom/src/main/java/org/apache/james/mime4j/internal/AbstractEntityBuilder.java
+++ b/dom/src/main/java/org/apache/james/mime4j/internal/AbstractEntityBuilder.java
@@ -41,7 +41,6 @@
 import org.apache.james.mime4j.dom.field.FieldName;
 import org.apache.james.mime4j.dom.field.ParsedField;
 import org.apache.james.mime4j.field.Fields;
-import org.apache.james.mime4j.message.BodyPartBuilder;
 import org.apache.james.mime4j.message.MultipartBuilder;
 import org.apache.james.mime4j.message.SingleBodyBuilder;
 import org.apache.james.mime4j.stream.Field;
diff --git a/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java b/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
index 50a554b5..1478c397 100644
--- a/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
+++ b/dom/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
@@ -31,7 +31,6 @@
 import org.apache.james.mime4j.dom.address.Mailbox;
 import org.apache.james.mime4j.dom.address.MailboxList;
 import org.apache.james.mime4j.dom.field.ParseException;
-import org.apache.james.mime4j.dom.field.ParsedField;
 import org.apache.james.mime4j.stream.BodyDescriptorBuilder;
 import org.apache.james.mime4j.stream.Field;
 import org.apache.james.mime4j.stream.MimeConfig;
diff --git a/dom/src/main/java/org/apache/james/mime4j/message/SingleBodyBuilder.java b/dom/src/main/java/org/apache/james/mime4j/message/SingleBodyBuilder.java
index eed1a726..66d99caf 100644
--- a/dom/src/main/java/org/apache/james/mime4j/message/SingleBodyBuilder.java
+++ b/dom/src/main/java/org/apache/james/mime4j/message/SingleBodyBuilder.java
@@ -32,7 +32,6 @@
 import org.apache.james.mime4j.dom.SingleBody;
 import org.apache.james.mime4j.dom.TextBody;
 import org.apache.james.mime4j.io.InputStreams;
-import org.apache.james.mime4j.util.CharsetUtil;
 import org.apache.james.mime4j.util.ContentUtil;
 
 /**
diff --git a/dom/src/test/java/org/apache/james/mime4j/message/AbstractEntityBuilderTest.java b/dom/src/test/java/org/apache/james/mime4j/message/AbstractEntityBuilderTest.java
index c7493da8..f9871155 100644
--- a/dom/src/test/java/org/apache/james/mime4j/message/AbstractEntityBuilderTest.java
+++ b/dom/src/test/java/org/apache/james/mime4j/message/AbstractEntityBuilderTest.java
@@ -20,7 +20,6 @@
 package org.apache.james.mime4j.message;
 
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
diff --git a/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/CharBufferWrapper.java b/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/CharBufferWrapper.java
index 4f85d1f0..a91dda6a 100644
--- a/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/CharBufferWrapper.java
+++ b/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/CharBufferWrapper.java
@@ -23,7 +23,6 @@
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
-import java.util.Objects;
 
 /**
  * Wraps a CharBuffer and exposes some convenience methods to easy parse with Mime4j.
diff --git a/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/MboxIterator.java b/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/MboxIterator.java
index 2e93701b..1b81019e 100644
--- a/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/MboxIterator.java
+++ b/mbox/src/main/java/org/apache/james/mime4j/mboxiterator/MboxIterator.java
@@ -21,18 +21,15 @@
 import java.io.CharConversionException;
 import java.io.Closeable;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.Iterator;
diff --git a/mbox/src/test/java/org/apache/james/mime4j/mboxiterator/ByteBufferInputStreamTest.java b/mbox/src/test/java/org/apache/james/mime4j/mboxiterator/ByteBufferInputStreamTest.java
index 388743b7..14d69273 100644
--- a/mbox/src/test/java/org/apache/james/mime4j/mboxiterator/ByteBufferInputStreamTest.java
+++ b/mbox/src/test/java/org/apache/james/mime4j/mboxiterator/ByteBufferInputStreamTest.java
@@ -23,7 +23,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
diff --git a/storage/src/main/java/org/apache/james/mime4j/storage/StorageBinaryBody.java b/storage/src/main/java/org/apache/james/mime4j/storage/StorageBinaryBody.java
index 1bd7c71a..b8a3fcb9 100644
--- a/storage/src/main/java/org/apache/james/mime4j/storage/StorageBinaryBody.java
+++ b/storage/src/main/java/org/apache/james/mime4j/storage/StorageBinaryBody.java
@@ -25,7 +25,6 @@
 
 import org.apache.james.mime4j.dom.BinaryBody;
 import org.apache.james.mime4j.util.ContentUtil;
-;
 
 /**
  * Binary body backed by a