diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationResult.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationResult.java
index 59517fd..9390098 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationResult.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/CompilationResult.java
@@ -20,7 +20,6 @@
 
 import java.util.List;
 
-import org.apache.sling.scripting.sightly.compiler.commands.Command;
 import org.apache.sling.scripting.sightly.compiler.commands.CommandStream;
 import org.osgi.annotation.versioning.ProviderType;
 
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/RuntimeFunction.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/RuntimeFunction.java
index ea59f31..eee3aed 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/RuntimeFunction.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/RuntimeFunction.java
@@ -16,8 +16,6 @@
  ******************************************************************************/
 package org.apache.sling.scripting.sightly.compiler;
 
-import java.util.Locale;
-
 /**
  * <p>
  *     This class documents what runtime functions (abstracted by
diff --git a/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/BackendCompiler.java b/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/BackendCompiler.java
index d03f2a8..16b1a51 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/BackendCompiler.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/compiler/backend/BackendCompiler.java
@@ -18,12 +18,7 @@
  ******************************************************************************/
 package org.apache.sling.scripting.sightly.compiler.backend;
 
-import org.apache.sling.scripting.sightly.compiler.CompilationUnit;
-import org.apache.sling.scripting.sightly.compiler.SightlyCompiler;
-import org.apache.sling.scripting.sightly.compiler.commands.Command;
 import org.apache.sling.scripting.sightly.compiler.commands.CommandStream;
-import org.apache.sling.scripting.sightly.compiler.commands.CommandVisitor;
-
 import org.osgi.annotation.versioning.ConsumerType;
 
 /**
diff --git a/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/PushStream.java b/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/PushStream.java
index 517408d..44324d3 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/PushStream.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/PushStream.java
@@ -21,7 +21,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.sling.scripting.sightly.compiler.SightlyCompilerException;
 import org.apache.sling.scripting.sightly.compiler.commands.Command;
 import org.apache.sling.scripting.sightly.compiler.commands.CommandHandler;
 import org.apache.sling.scripting.sightly.compiler.commands.CommandStream;
diff --git a/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/ElementContext.java b/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/ElementContext.java
index d4c3037..e9a85b2 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/ElementContext.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/frontend/ElementContext.java
@@ -24,7 +24,6 @@
 import java.util.List;
 
 import org.apache.sling.scripting.sightly.compiler.expression.Expression;
-import org.apache.sling.scripting.sightly.impl.html.dom.MarkupHandler;
 import org.apache.sling.scripting.sightly.impl.plugin.AggregatePluginInvoke;
 import org.apache.sling.scripting.sightly.impl.plugin.PluginCallInfo;
 import org.apache.sling.scripting.sightly.impl.plugin.PluginInvoke;
diff --git a/src/main/java/org/apache/sling/scripting/sightly/impl/filter/ExpressionContext.java b/src/main/java/org/apache/sling/scripting/sightly/impl/filter/ExpressionContext.java
index c753def..b9cc06c 100644
--- a/src/main/java/org/apache/sling/scripting/sightly/impl/filter/ExpressionContext.java
+++ b/src/main/java/org/apache/sling/scripting/sightly/impl/filter/ExpressionContext.java
@@ -18,8 +18,6 @@
  ******************************************************************************/
 package org.apache.sling.scripting.sightly.impl.filter;
 
-import org.apache.sling.scripting.sightly.compiler.expression.Expression;
-
 /**
  * Defines a context for the {@link Expression} that will be processed by a {@link Filter}. The context can then be used by filters to
  * further enhance the decision mechanism for their processing.
diff --git a/src/test/java/org/apache/sling/scripting/sightly/impl/frontend/ExpressionWrapperTest.java b/src/test/java/org/apache/sling/scripting/sightly/impl/frontend/ExpressionWrapperTest.java
index a9b0588..5fffd65 100644
--- a/src/test/java/org/apache/sling/scripting/sightly/impl/frontend/ExpressionWrapperTest.java
+++ b/src/test/java/org/apache/sling/scripting/sightly/impl/frontend/ExpressionWrapperTest.java
@@ -18,6 +18,8 @@
  ******************************************************************************/
 package org.apache.sling.scripting.sightly.impl.frontend;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -46,9 +48,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class ExpressionWrapperTest {
 
     private static List<Filter> filters;