diff --git a/spring-cloud-sleuth-core/src/main/java/brave/spring/rabbit/SleuthTracingRabbitListenerAdvice.java b/spring-cloud-sleuth-core/src/main/java/brave/spring/rabbit/SleuthTracingRabbitListenerAdvice.java
deleted file mode 100644
index fb947b298..000000000
--- a/spring-cloud-sleuth-core/src/main/java/brave/spring/rabbit/SleuthTracingRabbitListenerAdvice.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2013-2018 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package brave.spring.rabbit;
-
-/**
- * Internal class - do not use. Will be removed when fixed in Brave.
- *
- * @author Marcin Grzejszczak
- * @since 2.1.0
- */
-public final class SleuthTracingRabbitListenerAdvice {
-
-	public static TracingRabbitListenerAdvice advice(SpringRabbitTracing tracing) {
-		return new TracingRabbitListenerAdvice(tracing);
-	}
-
-}
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java
index a5fac76f2..46568de66 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceMessagingAutoConfiguration.java
@@ -26,7 +26,6 @@ import brave.Tracing;
 import brave.jms.JmsTracing;
 import brave.kafka.clients.KafkaTracing;
 import brave.propagation.CurrentTraceContext;
-import brave.spring.rabbit.SleuthTracingRabbitListenerAdvice;
 import brave.spring.rabbit.SpringRabbitTracing;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
@@ -39,7 +38,6 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.aop.framework.ProxyFactoryBean;
@@ -185,18 +183,8 @@ class SleuthRabbitBeanPostProcessor implements BeanPostProcessor {
 			return rabbitTracing().decorateRabbitTemplate((RabbitTemplate) bean);
 		}
 		else if (bean instanceof SimpleRabbitListenerContainerFactory) {
-			try {
-				return rabbitTracing().decorateSimpleRabbitListenerContainerFactory(
-						(SimpleRabbitListenerContainerFactory) bean);
-			}
-			catch (NullPointerException ex) {
-				// TODO: Fix this in Rabbit or Brave
-				SpringRabbitTracing springRabbitTracing = rabbitTracing();
-				SimpleRabbitListenerContainerFactory factory = (SimpleRabbitListenerContainerFactory) bean;
-				factory.setAdviceChain(
-						SleuthTracingRabbitListenerAdvice.advice(springRabbitTracing));
-				return factory;
-			}
+			return rabbitTracing().decorateSimpleRabbitListenerContainerFactory(
+					(SimpleRabbitListenerContainerFactory) bean);
 		}
 		return bean;
 	}
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
index 287d56cbd..665a23264 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
@@ -93,7 +93,7 @@ public class TraceWebAutoConfiguration {
 	}
 
 	@Configuration
-	@ConditionalOnClass({ ServerProperties.class, WebEndpointProperties.class })
+	@ConditionalOnClass({ServerProperties.class, WebEndpointProperties.class})
 	protected static class ServerSkipPatternProviderConfig {
 
 		/**
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/grpc/stubs/HelloServiceGrpc.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/grpc/stubs/HelloServiceGrpc.java
index 7e4437c6a..cb4d1d534 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/grpc/stubs/HelloServiceGrpc.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/grpc/stubs/HelloServiceGrpc.java
@@ -73,15 +73,16 @@ public final class HelloServiceGrpc {
 	}
 
 	/**
-	 * Creates a new blocking-style stub that supports unary and streaming output calls on
-	 * the service
+	 * Creates a new blocking-style stub that supports unary and streaming
+	 * output calls on the service
 	 */
 	public static HelloServiceBlockingStub newBlockingStub(io.grpc.Channel channel) {
 		return new HelloServiceBlockingStub(channel);
 	}
 
 	/**
-	 * Creates a new ListenableFuture-style stub that supports unary calls on the service
+	 * Creates a new ListenableFuture-style stub that supports unary calls on
+	 * the service
 	 */
 	public static HelloServiceFutureStub newFutureStub(io.grpc.Channel channel) {
 		return new HelloServiceFutureStub(channel);
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java
index 7ddb02ddd..e7c6b93d5 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java
@@ -389,7 +389,8 @@ public class WebClientTests {
 
 		try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span)) {
 			this.webClient.get().uri("http://localhost:" + this.port + "/noresponse")
-					.retrieve().bodyToMono(String.class).timeout(Duration.ofMillis(0))
+					.retrieve().bodyToMono(String.class)
+					.timeout(Duration.ofMillis(0))
 					.block();
 		}
 		catch (Exception e) {