diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
index 70c91d9b..8ff8e28d 100644
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
+++ b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java
@@ -140,11 +140,7 @@ public class SimpleMessaging implements IMessaging, EventHandler<ValueEvent> {
             m_processor.processPublish((PublishEvent) evt);
         } else if (evt instanceof StopEvent) {
             processStop();
-        } /*else if (evt instanceof DisconnectEvent) {
-            DisconnectEvent disEvt = (DisconnectEvent) evt;
-            String clientID = (String) disEvt.getSession().getAttribute(Constants.ATTR_CLIENTID);
-            m_processor.processDisconnect(disEvt.getSession(), clientID, false);
-        } */else if (evt instanceof ProtocolEvent) {
+        } else if (evt instanceof ProtocolEvent) {
             ServerChannel session = ((ProtocolEvent) evt).getSession();
             AbstractMessage message = ((ProtocolEvent) evt).getMessage();
             if (message instanceof ConnectMessage ||
diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/DisconnectEvent.java b/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/DisconnectEvent.java
deleted file mode 100644
index 8dc2d52a..00000000
--- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/DisconnectEvent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2012-2014 The original author or authors
- * ------------------------------------------------------
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- *
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * The Apache License v2.0 is available at
- * http://www.opensource.org/licenses/apache2.0.php
- *
- * You may elect to redistribute this code under either of these licenses.
- */
-package org.dna.mqtt.moquette.messaging.spi.impl.events;
-
-import org.dna.mqtt.moquette.server.ServerChannel;
-
-/**
- *
- * @author andrea
- */
-public class DisconnectEvent extends MessagingEvent {
-    
-    ServerChannel m_session;
-    
-    public DisconnectEvent(ServerChannel session) {
-        m_session = session;
-    }
-
-    public ServerChannel getSession() {
-        return m_session;
-    }
-    
-    
-}