diff --git a/README.md b/README.md
index 73ab65cdc..c83761823 100644
--- a/README.md
+++ b/README.md
@@ -395,7 +395,7 @@ When you build the latest code from source, you'll have access to the latest sna
     <dependency>
         <groupId>net.lightbody.bmp</groupId>
         <artifactId>browsermob-core</artifactId>
-        <version>2.1.23-SNAPSHOT</version>
+        <version>2.1.24-SNAPSHOT</version>
         <scope>test</scope>
     </dependency>
 ```
diff --git a/browsermob-core/pom.xml b/browsermob-core/pom.xml
index f014e04f8..b6f77501b 100644
--- a/browsermob-core/pom.xml
+++ b/browsermob-core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.23-SNAPSHOT</version>
+        <version>2.1.24-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java
index e349cf93c..26b386b53 100644
--- a/browsermob-core/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java
+++ b/browsermob-core/src/main/java/net/lightbody/bmp/filters/HarCaptureFilter.java
@@ -763,7 +763,6 @@ public void serverToProxyResponseReceived() {
     }
 
     protected static void logFailedRequestIfRequired(HarRequest request, HarResponse response) {
-        System.out.println("TEST");
         if (!isAlreadyLoggedIn.get() && (response.getStatus() >= 500 || response.getStatus() == 0)) {
             MDC.put("caller", "mobproxy");
             MDC.put("http_response_code", String.valueOf(response.getStatus()));
diff --git a/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java b/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java
index 6127a22e4..7f5575bb2 100644
--- a/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java
+++ b/browsermob-core/src/main/java/net/lightbody/bmp/filters/StatsDMetricsFilter.java
@@ -8,29 +8,16 @@
 import io.netty.handler.codec.http.HttpResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.littleshoot.proxy.HttpFiltersAdapter;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 
 public class StatsDMetricsFilter extends HttpsAwareFiltersAdapter {
-    private StatsDClient client;
-    private static InheritableThreadLocal<HttpRequest> HTTP_REQUEST_STORAGE = new InheritableThreadLocal<>();
-
     public StatsDMetricsFilter(HttpRequest originalRequest, ChannelHandlerContext ctx) {
         super(originalRequest, ctx);
-        this.client = new NonBlockingStatsDClient("automated_tests", getStatsDHost(), getStatsDPort());
-    }
-
-    @Override
-    public HttpResponse clientToProxyRequest(HttpObject httpObject) {
-        if (httpObject instanceof HttpRequest) {
-            HttpRequest httpRequest = (HttpRequest) httpObject;
-            HTTP_REQUEST_STORAGE.set(httpRequest);
-        }
-        return null;
     }
 
-
     @Override
     public HttpObject serverToProxyResponse(HttpObject httpObject) {
         if (HttpResponse.class.isAssignableFrom(httpObject.getClass())) {
@@ -43,30 +30,29 @@ public HttpObject serverToProxyResponse(HttpObject httpObject) {
 
     private void prepareStatsDMetrics(int status) {
         if (status > 399 || status == 0) {
-            String metric;
-            HttpRequest request = HTTP_REQUEST_STORAGE.get();
-            String url = getFullUrl(request);
-            metric = getProxyPrefix().concat(
+            String url = getFullUrl(originalRequest);
+            String metric = getProxyPrefix().concat(
                     prepareMetric(url)).concat(String.format(".%s", status));
+            StatsDClient client = new NonBlockingStatsDClient("automated_tests", getStatsDHost(), getStatsDPort());
             client.increment(metric);
-            HTTP_REQUEST_STORAGE.remove();
+            client.stop();
         }
     }
 
 
-    static String getStatsDHost() {
+    protected static String getStatsDHost() {
         return StringUtils.isEmpty(System.getenv("STATSD_HOST")) ? "localhost" : System.getenv("STATSD_HOST");
     }
 
-    static int getStatsDPort() {
+    protected static int getStatsDPort() {
         return StringUtils.isEmpty(System.getenv("STATSD_PORT")) ? 8125 : NumberUtils.toInt(System.getenv("STATSD_PORT"));
     }
 
-    public static String getProxyPrefix() {
+    protected static String getProxyPrefix() {
         return "proxy.";
     }
 
-    public static String prepareMetric(String initialUrl) {
+    protected static String prepareMetric(String initialUrl) {
         URI uri = null;
         try {
             uri = new URI(initialUrl);
diff --git a/browsermob-dist/pom.xml b/browsermob-dist/pom.xml
index 89ae83d5b..93abb9b47 100644
--- a/browsermob-dist/pom.xml
+++ b/browsermob-dist/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.23-SNAPSHOT</version>
+        <version>2.1.24-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/browsermob-legacy/pom.xml b/browsermob-legacy/pom.xml
index 7d79f2866..a154b0d0c 100644
--- a/browsermob-legacy/pom.xml
+++ b/browsermob-legacy/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.23-SNAPSHOT</version>
+        <version>2.1.24-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/browsermob-rest/pom.xml b/browsermob-rest/pom.xml
index bc5cf6ff5..144405a84 100644
--- a/browsermob-rest/pom.xml
+++ b/browsermob-rest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.23-SNAPSHOT</version>
+        <version>2.1.24-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/mitm/pom.xml b/mitm/pom.xml
index ba27b42cc..7aa96b2af 100644
--- a/mitm/pom.xml
+++ b/mitm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>browsermob-proxy</artifactId>
         <groupId>net.lightbody.bmp</groupId>
-        <version>2.1.23-SNAPSHOT</version>
+        <version>2.1.24-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 68d36a5cb..7fc8df66d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.lightbody.bmp</groupId>
     <artifactId>browsermob-proxy</artifactId>
-    <version>2.1.23-SNAPSHOT</version>
+    <version>2.1.24-SNAPSHOT</version>
     <modules>
         <module>browsermob-core</module>
         <module>browsermob-legacy</module>