diff --git a/pom.xml b/pom.xml
index 0f082ddb..7ee3be55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.smoketurner.dropwizard</groupId>
         <artifactId>dropwizard-pom</artifactId>
-        <version>2.0.15-1</version>
+        <version>2.0.16-1</version>
     </parent>
 
     <artifactId>dropwizard-zipkin</artifactId>
diff --git a/zipkin-client/src/main/java/com/smoketurner/dropwizard/zipkin/client/ZipkinClientConfiguration.java b/zipkin-client/src/main/java/com/smoketurner/dropwizard/zipkin/client/ZipkinClientConfiguration.java
index c32bdbf2..293e21f6 100644
--- a/zipkin-client/src/main/java/com/smoketurner/dropwizard/zipkin/client/ZipkinClientConfiguration.java
+++ b/zipkin-client/src/main/java/com/smoketurner/dropwizard/zipkin/client/ZipkinClientConfiguration.java
@@ -15,9 +15,9 @@
  */
 package com.smoketurner.dropwizard.zipkin.client;
 
+import javax.validation.constraints.NotEmpty;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.client.JerseyClientConfiguration;
-import org.hibernate.validator.constraints.NotEmpty;
 
 public class ZipkinClientConfiguration extends JerseyClientConfiguration {
 
diff --git a/zipkin-core/src/main/java/com/smoketurner/dropwizard/zipkin/AbstractZipkinFactory.java b/zipkin-core/src/main/java/com/smoketurner/dropwizard/zipkin/AbstractZipkinFactory.java
index 5df66024..2fb6b443 100644
--- a/zipkin-core/src/main/java/com/smoketurner/dropwizard/zipkin/AbstractZipkinFactory.java
+++ b/zipkin-core/src/main/java/com/smoketurner/dropwizard/zipkin/AbstractZipkinFactory.java
@@ -15,6 +15,14 @@
  */
 package com.smoketurner.dropwizard.zipkin;
 
+import java.util.Optional;
+import javax.annotation.Nullable;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import brave.Tracing;
 import brave.context.slf4j.MDCScopeDecorator;
 import brave.handler.SpanHandler;
@@ -28,18 +36,9 @@
 import brave.propagation.ThreadLocalCurrentTraceContext;
 import brave.sampler.Sampler;
 import brave.sampler.SamplerFunction;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.lifecycle.Managed;
 import io.dropwizard.setup.Environment;
 import io.dropwizard.util.Strings;
-import io.dropwizard.validation.PortRange;
-import java.util.Optional;
-import javax.annotation.Nullable;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * @see ConsoleZipkinFactory