diff --git a/framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java b/framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java
index a7fc214..92e17f4 100644
--- a/framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java
+++ b/framework/src/main/java/org/toop/framework/eventbus/bus/DisruptorEventBus.java
@@ -105,18 +105,6 @@ public class DisruptorEventBus implements EventBus {
                 }
             }
         }
-
-        // TODO, Still needed?
-        CopyOnWriteArrayList<Subscriber<?, ?>> genericListeners = (CopyOnWriteArrayList<Subscriber<?, ?>>) eventsHolder.get(Object.class);
-        if (genericListeners != null) {
-            for (Subscriber<?, ?> listener : genericListeners) {
-                try {
-                    callListener(listener, event);
-                } catch (Throwable e) {
-                    logger.warn("Exception while handling event: {}", event, e);
-                }
-            }
-        }
     }