Index: trunk/src/main/java/omq/client/proxy/Proxymq.java
===================================================================
--- trunk/src/main/java/omq/client/proxy/Proxymq.java	(revision 70)
+++ trunk/src/main/java/omq/client/proxy/Proxymq.java	(revision 72)
@@ -1,9 +1,7 @@
 package omq.client.proxy;
 
-import java.io.IOException;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -16,7 +14,4 @@
 import omq.client.listener.ResponseListener;
 import omq.common.broker.Broker;
-import omq.common.event.Event;
-import omq.common.event.EventDispatcher;
-import omq.common.event.EventListener;
 import omq.common.message.Request;
 import omq.common.message.Response;
@@ -25,5 +20,4 @@
 import omq.exception.OmqException;
 import omq.exception.RetryException;
-import omq.exception.SerializerException;
 import omq.exception.TimeoutException;
 
@@ -55,9 +49,7 @@
 	private transient Broker broker;
 	private transient ResponseListener rListener;
-	private transient EventDispatcher dispatcher;
 	private transient Serializer serializer;
 	private transient Properties env;
 	private transient Map<String, byte[]> results;
-	private transient Map<String, EventListener<?>> listeners;
 
 	private static final Map<String, Class<?>> primitiveClasses = new HashMap<String, Class<?>>();
@@ -92,5 +84,4 @@
 		this.broker = broker;
 		rListener = broker.getResponseListener();
-		dispatcher = broker.getEventDispatcher();
 		serializer = broker.getSerializer();
 
@@ -105,6 +96,4 @@
 		serializerType = env.getProperty(ParameterQueue.SERIALIZER_NAME, Serializer.JAVA);
 
-		listeners = new HashMap<String, EventListener<?>>();
-
 		// Create a new hashmap and registry it in rListener
 		results = new HashMap<String, byte[]>();
@@ -121,12 +110,4 @@
 			if (methodName.equals("getRef")) {
 				return getRef();
-			} else if (methodName.equals("addListener")) {
-				addListener((EventListener<?>) arguments[0]);
-				return null;
-			} else if (methodName.equals("removeListener")) {
-				removeListener((EventListener<?>) arguments[0]);
-				return null;
-			} else if (methodName.equals("getListeners")) {
-				return getListeners();
 			}
 		}
@@ -306,27 +287,3 @@
 	}
 
-	@Override
-	public void notifyEvent(Event event) throws IOException, SerializerException {
-	}
-
-	@Override
-	public void addListener(EventListener<?> eventListener) throws Exception {
-		if (eventListener.getTopic() == null) {
-			eventListener.setTopic(uid);
-		}
-		listeners.put(eventListener.getTopic(), eventListener);
-		dispatcher.addListener(eventListener);
-	}
-
-	@Override
-	public void removeListener(EventListener<?> eventListener) throws Exception {
-		listeners.remove(eventListener.getTopic());
-		dispatcher.removeListener(eventListener);
-	}
-
-	@Override
-	public Collection<EventListener<?>> getListeners() throws Exception {
-		return listeners.values();
-	}
-
 }