diff --git a/build-tools/src/main/resources/checkstyle.xml b/build-tools/src/main/resources/checkstyle.xml
index a20896e45..1ab895ffb 100644
--- a/build-tools/src/main/resources/checkstyle.xml
+++ b/build-tools/src/main/resources/checkstyle.xml
@@ -15,5 +15,6 @@
 			<property name="ignoreComments" value="true"/>
 		</module>
 		<module name="UnusedImports"/>
+		<module name="RedundantImport"/>
 	</module>
 </module>
\ No newline at end of file
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixAutoConfiguration.java
index e843abf1a..13a073a3b 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixAutoConfiguration.java
@@ -3,7 +3,6 @@ package org.springframework.cloud.sleuth.instrument.hystrix;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.sleuth.Tracer;
-import org.springframework.cloud.sleuth.Tracer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java
index 64748ddb9..e87a2b280 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/scheduling/TraceSchedulingAspect.java
@@ -21,12 +21,11 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.cloud.sleuth.Span;
 import org.springframework.cloud.sleuth.Tracer;
-import org.springframework.scheduling.annotation.Scheduled;
 
 /**
  * Aspect that creates a new Span for running threads executing methods annotated with
- * {@link Scheduled} annotation. For every execution of scheduled method a new trace will
- * be started.
+ * {@link org.springframework.scheduling.annotation.Scheduled} annotation.
+ * For every execution of scheduled method a new trace will be started.
  *
  * @author Tomasz Nurkewicz, 4financeIT
  * @author Michal Chmielarz, 4financeIT
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java
index bb5fc8ff0..922ca9ba7 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java
@@ -16,9 +16,7 @@
 
 package org.springframework.cloud.sleuth.instrument.web;
 
-import java.lang.reflect.Field;
-import java.util.concurrent.Callable;
-
+import lombok.extern.apachecommons.CommonsLog;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -26,29 +24,31 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.cloud.sleuth.TraceAccessor;
 import org.springframework.cloud.sleuth.Tracer;
 import org.springframework.cloud.sleuth.instrument.TraceCallable;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestOperations;
 import org.springframework.web.context.request.async.WebAsyncTask;
 
-import lombok.extern.apachecommons.CommonsLog;
+import java.lang.reflect.Field;
+import java.util.concurrent.Callable;
 
 /**
  * Aspect that adds correlation id to
  * <p/>
  * <ul>
- * <li>{@link RestController} annotated classes with public {@link Callable} methods</li>
- * <li>{@link Controller} annotated classes with public {@link Callable} methods</li>
- * <li>{@link Controller} or {@link RestController} annotated classes with public {@link WebAsyncTask} methods</li>
+ * <li>{@link org.springframework.web.bind.annotation.RestController} annotated classes
+ * with public {@link Callable} methods</li>
+ * <li>{@link org.springframework.stereotype.Controller} annotated classes with public
+ * {@link Callable} methods</li>
+ * <li>{@link org.springframework.stereotype.Controller} or
+ * {@link org.springframework.web.bind.annotation.RestController} annotated classes with
+ * public {@link WebAsyncTask} methods</li>
  * </ul>
  * <p/>
  * For controllers an around aspect is created that wraps the {@link Callable#call()}
  * method execution in {@link TraceCallable}
  * <p/>
  *
- * @see RestController
- * @see Controller
- * @see RestOperations
+ * @see org.springframework.web.bind.annotation.RestController
+ * @see org.springframework.stereotype.Controller
+ * @see org.springframework.web.client.RestOperations
  * @see TraceCallable
  * @see Tracer
  *