diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java
index 8c5e146ba..e025bbafe 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/async/ExecutorBeanPostProcessor.java
@@ -21,7 +21,6 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.aopalliance.aop.Advice;
@@ -181,14 +180,6 @@ class ExecutorBeanPostProcessor implements BeanPostProcessor {
 		factory.setProxyTargetClass(cglibProxy);
 		factory.addAdvice(advice);
 		factory.setTarget(bean);
-		if (JavaVersion.current().isJava11Compatible()) {
-			if (log.isDebugEnabled()) {
-				log.debug("Creating an additional ClassLoader for JDK11");
-			}
-			factory.setBeanClassLoader(new ClassLoader(this.getClass().getClassLoader()) {
-
-			});
-		}
 		return getObject(factory);
 	}
 
diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java
index fe6119181..11eddcb71 100644
--- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java
+++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfiguration.java
@@ -58,7 +58,8 @@ import org.springframework.util.Assert;
  * @deprecated
  */
 @Configuration
-@ConditionalOnProperty(value = { "spring.sleuth.enabled", "spring.zipkin.enabled" }, matchIfMissing = true)
+@ConditionalOnProperty(value = { "spring.sleuth.enabled",
+		"spring.zipkin.enabled" }, matchIfMissing = true)
 @AutoConfigureBefore(ZipkinAutoConfiguration.class)
 @Deprecated
 public class ZipkinBackwardsCompatibilityAutoConfiguration {
diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfigurationTests.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfigurationTests.java
index e78a8a58b..2db9e75e5 100644
--- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfigurationTests.java
+++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinBackwardsCompatibilityAutoConfigurationTests.java
@@ -35,8 +35,7 @@ public class ZipkinBackwardsCompatibilityAutoConfigurationTests {
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(
 					ZipkinBackwardsCompatibilityAutoConfiguration.class,
-					ZipkinAutoConfiguration.class,
-					TraceAutoConfiguration.class));
+					ZipkinAutoConfiguration.class, TraceAutoConfiguration.class));
 
 	@Test
 	public void shouldLoadBeans() {
@@ -50,26 +49,24 @@ public class ZipkinBackwardsCompatibilityAutoConfigurationTests {
 
 	@Test
 	public void shouldNotLoadBackwardsCompatibilityConfigWhenZipkinDisabled() {
-		this.contextRunner
-				.withPropertyValues("spring.zipkin.enabled=false")
+		this.contextRunner.withPropertyValues("spring.zipkin.enabled=false")
 				.run(context -> {
-				assertThat(context.getBeansOfType(ZipkinProperties.class)).isEmpty();
-				assertThat(context.getBeansOfType(BytesEncoder.class)).isEmpty();
-				assertThat(context.getBean(ReporterMetrics.class)).isNotNull(); // TraceAutoConfiguration
-				assertThat(context.getBean(Reporter.class)).isNotNull(); // noOpSpanReporter
-		});
+					assertThat(context.getBeansOfType(ZipkinProperties.class)).isEmpty();
+					assertThat(context.getBeansOfType(BytesEncoder.class)).isEmpty();
+					assertThat(context.getBean(ReporterMetrics.class)).isNotNull(); // TraceAutoConfiguration
+					assertThat(context.getBean(Reporter.class)).isNotNull(); // noOpSpanReporter
+				});
 	}
 
 	@Test
 	public void shouldNotLoadBackwardsCompatibilityConfigWhenSleuthDisabled() {
-		this.contextRunner
-				.withPropertyValues("spring.sleuth.enabled=false")
+		this.contextRunner.withPropertyValues("spring.sleuth.enabled=false")
 				.run(context -> {
-				assertThat(context.getBeansOfType(ZipkinProperties.class)).isEmpty();
-				assertThat(context.getBeansOfType(BytesEncoder.class)).isEmpty();
-				assertThat(context.getBeansOfType(ReporterMetrics.class)).isEmpty();
-				assertThat(context.getBeansOfType(Reporter.class)).isEmpty();
-		});
+					assertThat(context.getBeansOfType(ZipkinProperties.class)).isEmpty();
+					assertThat(context.getBeansOfType(BytesEncoder.class)).isEmpty();
+					assertThat(context.getBeansOfType(ReporterMetrics.class)).isEmpty();
+					assertThat(context.getBeansOfType(Reporter.class)).isEmpty();
+				});
 	}
 
 }