diff --git a/src/main/java/org/apache/sling/api/SlingConstants.java b/src/main/java/org/apache/sling/api/SlingConstants.java
index 1402dae..60b1aa9 100644
--- a/src/main/java/org/apache/sling/api/SlingConstants.java
+++ b/src/main/java/org/apache/sling/api/SlingConstants.java
@@ -18,8 +18,6 @@
  */
 package org.apache.sling.api;
 
-import org.apache.sling.api.resource.observation.ResourceChangeListener;
-
 /**
  * The <code>SlingConstants</code> interface provides some symbolic constants
  * for well known constant strings in Sling. Even though these constants will
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceProvider.java b/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
index 778c60a..2aaf9d3 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
@@ -24,8 +24,6 @@
 import javax.annotation.Nonnull;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.sling.api.SlingException;
-
 import org.osgi.annotation.versioning.ConsumerType;
 
 /**
diff --git a/src/main/java/org/apache/sling/api/servlets/ServletResolverConstants.java b/src/main/java/org/apache/sling/api/servlets/ServletResolverConstants.java
index 4bc6edd..005610b 100644
--- a/src/main/java/org/apache/sling/api/servlets/ServletResolverConstants.java
+++ b/src/main/java/org/apache/sling/api/servlets/ServletResolverConstants.java
@@ -18,8 +18,6 @@
  */
 package org.apache.sling.api.servlets;
 
-import javax.servlet.ServletConfig;
-
 /**
  * Service registration properties and common values used for registering a Sling Servlet.
  * 
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java b/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java
index c57208c..eeceeaf 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java
@@ -22,11 +22,8 @@
 
 import javax.annotation.Nonnull;
 
-import org.apache.sling.api.resource.QuerySyntaxException;
 import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ValueMap;
-
 import org.osgi.annotation.versioning.ConsumerType;
 
 
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java b/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java
index 076ebfd..62a4086 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java
@@ -18,13 +18,10 @@
  */
 package org.apache.sling.spi.resource.provider;
 
-import java.util.Map;
-
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 import org.apache.sling.api.resource.ResourceResolver;
-
 import org.osgi.annotation.versioning.ProviderType;
 
 /**
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java b/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
index 08330e6..6d0abe6 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
@@ -25,14 +25,10 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
-import org.apache.sling.api.SlingException;
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.api.resource.SyntheticResource;
 import org.osgi.annotation.versioning.ConsumerType;
 
 /**