diff --git a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java b/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
deleted file mode 100644
index fa55edec87f..00000000000
--- a/server/container/util/src/main/java/org/apache/james/util/concurrent/JMXEnabledThreadPoolExecutor.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you 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 org.apache.james.util.concurrent;
-
-import java.lang.management.ManagementFactory;
-import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-/**
- * {@link ThreadPoolExecutor} which expose statistics via JMX
- */
-public class JMXEnabledThreadPoolExecutor extends ThreadPoolExecutor implements JMXEnabledThreadPoolExecutorMBean {
-
-    private final String jmxPath;
-    private final ThreadLocal<Long> startTime = new ThreadLocal<>();
-    private final AtomicLong totalTime = new AtomicLong(0);
-    private final AtomicInteger totalTasks = new AtomicInteger(0);
-    private MBeanServer mbeanServer;
-    private String mbeanName;
-
-    public JMXEnabledThreadPoolExecutor(int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit, BlockingQueue<Runnable> queue, NamedThreadFactory tFactory, String jmxPath) {
-        super(corePoolSize, maximumPoolSize, keepAliveTime, unit, queue, tFactory);
-        this.jmxPath = jmxPath;
-        registerMBean();
-    }
-
-    @Override
-    protected void beforeExecute(Thread t, Runnable r) {
-        super.beforeExecute(t, r);
-        startTime.set(System.currentTimeMillis());
-    }
-
-    @Override
-    protected void afterExecute(Runnable r, Throwable t) {
-        long time = System.currentTimeMillis() - startTime.get();
-        totalTasks.incrementAndGet();
-        totalTime.addAndGet(time);
-        super.afterExecute(r, t);
-    }
-
-    private void registerMBean() {
-        if (jmxPath != null) {
-            mbeanServer = ManagementFactory.getPlatformMBeanServer();
-            mbeanName = jmxPath + ",threadpool=" + ((NamedThreadFactory) getThreadFactory()).getName();
-            try {
-                mbeanServer.registerMBean(this, new ObjectName(mbeanName));
-            } catch (Exception e) {
-                throw new RuntimeException("Unable to register mbean", e);
-            }
-        }
-    }
-
-    private void unregisterMBean() {
-        if (jmxPath != null) {
-            try {
-                mbeanServer.unregisterMBean(new ObjectName(mbeanName));
-            } catch (Exception e) {
-                throw new RuntimeException("Unable to unregister mbean", e);
-            }
-        }
-    }
-
-    @Override
-    public synchronized void shutdown() {
-        // synchronized, because there is no way to access super.mainLock, which
-        // would be
-        // the preferred way to make this threadsafe
-        if (!isShutdown()) {
-            unregisterMBean();
-        }
-        super.shutdown();
-        startTime.remove();
-    }
-
-    @Override
-    public synchronized List<Runnable> shutdownNow() {
-        // synchronized, because there is no way to access super.mainLock, which
-        // would be
-        // the preferred way to make this threadsafe
-        if (!isShutdown()) {
-            unregisterMBean();
-        }
-        return super.shutdownNow();
-    }
-
-    @Override
-    public synchronized int getTotalTasks() {
-        return totalTasks.get();
-    }
-
-    @Override
-    public synchronized double getAverageTaskTime() {
-        return (totalTasks.get() == 0) ? 0 : totalTime.get() / totalTasks.get();
-    }
-
-    @Override
-    public int getActiveThreads() {
-        return getPoolSize();
-    }
-
-    @Override
-    public int getActiveTasks() {
-        return getActiveCount();
-    }
-
-    @Override
-    public int getQueuedTasks() {
-        return getQueue().size();
-    }
-
-    @Override
-    public int getMaximalThreads() {
-        return getMaximumPoolSize();
-    }
-
-    /**
-     * Create a cached instance of this class. If jmxPath is null it will not
-     * register itself to the {@link MBeanServer}
-     * 
-     * @param jmxPath
-     * @param name
-     * @return pool
-     * 
-     */
-    public static JMXEnabledThreadPoolExecutor newCachedThreadPool(String jmxPath, String name) {
-        return new JMXEnabledThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>(), NamedThreadFactory.withName(name), jmxPath);
-
-    }
-
-    /**
-     * Create a cached instance of this class. If jmxPath is null it will not
-     * register itself to the {@link MBeanServer}
-     * 
-     * @param jmxPath
-     * @param factory
-     * @return pool
-     */
-    public static JMXEnabledThreadPoolExecutor newCachedThreadPool(String jmxPath, NamedThreadFactory factory) {
-        return new JMXEnabledThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<>(), factory, jmxPath);
-    }
-    
-    public static JMXEnabledThreadPoolExecutor newFixedThreadPool(String jmxPath, int nThreads, NamedThreadFactory threadFactory) {
-        return new JMXEnabledThreadPoolExecutor(nThreads, nThreads, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), threadFactory, jmxPath);
-    }
-    
-    public static JMXEnabledThreadPoolExecutor newFixedThreadPool(String jmxPath, String name, int nThreads) {
-        return newFixedThreadPool(jmxPath, nThreads, NamedThreadFactory.withName(name));
-    }
-}