diff --git a/broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java b/broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java
deleted file mode 100644
index 795f6dce..00000000
--- a/broker/src/main/java/io/moquette/spi/impl/BestEffortMessageSender.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.moquette.spi.impl;
-
-import io.moquette.parser.proto.messages.AbstractMessage;
-import io.moquette.parser.proto.messages.PublishMessage;
-import io.moquette.server.ConnectionDescriptor;
-import io.moquette.spi.ClientSession;
-import io.netty.channel.Channel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.ByteBuffer;
-import java.util.concurrent.ConcurrentMap;
-
-class BestEffortMessageSender {
-
-    private static final Logger LOG = LoggerFactory.getLogger(BestEffortMessageSender.class);
-    private final ConcurrentMap<String, ConnectionDescriptor> connectionDescriptors;
-
-    public BestEffortMessageSender(ConcurrentMap<String, ConnectionDescriptor> connectionDescriptors) {
-        this.connectionDescriptors = connectionDescriptors;
-    }
-
-    void publishQos0(ClientSession clientsession, PublishMessage pubMessage) {
-        String clientId = clientsession.clientID;
-        LOG.info("send publish message to <{}> on topic <{}>", clientId, pubMessage.getTopicName());
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("content <{}>", DebugUtils.payload2Str(pubMessage.getPayload()));
-        }
-
-        if (connectionDescriptors == null) {
-            throw new RuntimeException("Internal bad error, found connectionDescriptors to null while it should be " +
-                    "initialized, somewhere it's overwritten!!");
-        }
-        if (connectionDescriptors.get(clientId) == null) {
-            //TODO while we were publishing to the target client, that client disconnected,
-            // could happen is not an error HANDLE IT
-            throw new RuntimeException(String.format("Can't find a ConnectionDescriptor for client <%s> in cache <%s>",
-                    clientId, connectionDescriptors));
-        }
-        Channel channel = connectionDescriptors.get(clientId).channel;
-        //TODO attention channel could be null, because in the mean time it get closed
-
-        LOG.trace("Session for clientId {}", clientId);
-        if (channel.isWritable()) {
-            LOG.debug("channel is writable");
-            //if channel is writable don't enqueue
-            channel.writeAndFlush(pubMessage);
-        }
-    }
-
-
-}