diff --git a/src/comm_manager_epoll.c b/src/comm_manager_epoll.c
index ca79db3..a1f3ca8 100644
--- a/src/comm_manager_epoll.c
+++ b/src/comm_manager_epoll.c
@@ -38,8 +38,6 @@
 
 struct epoll_event events[MAXEVENTS];
 
-extern int count_write_ready;
-
 static
 int
 commManagerEpollCtor(void * _this, va_list * params)
@@ -124,7 +122,6 @@ TR_commManagerEpollSelect(void * _this, TR_Event event, int timeout)
 
 			TR_eventHandlerIssueEvent((TR_EventHandler)this, _event);
 			this->events[i].events &= ~EPOLLOUT;
-			count_write_ready++;
 		}
 	}
 }
diff --git a/src/i_comm_manager.c b/src/i_comm_manager.c
index 04c6fbf..c9ae933 100644
--- a/src/i_comm_manager.c
+++ b/src/i_comm_manager.c
@@ -65,7 +65,6 @@ TR_commManagerSelect(void * _this, TR_Event event)
 	}
 
 	TR_CALL(_this, TR_CommManager, select, event, timeout);
-	TR_eventDispatcherUpdateNextPoll(dispatcher);
 
 	return TR_EVENT_DONE;
 }
diff --git a/src/io_handler.c b/src/io_handler.c
index 3981c0c..d649d60 100644
--- a/src/io_handler.c
+++ b/src/io_handler.c
@@ -29,9 +29,6 @@
 #include "tr/comm_end_point.h"
 #include "tr/interface/comm_end_point.h"
 
-extern int count_write_ready;
-int count_write_ready_handle = 0;
-
 static
 int
 ioHandlerCtor(void * _this, va_list * params)
@@ -93,8 +90,6 @@ ioHandlerWrite(void * _this, TR_Event event)
 {
 	TR_Event        revent, close_event = NULL;
 
-	count_write_ready_handle++;
-
 	switch (TR_cepWriteBuffered((TR_CommEndPoint)event->subject)) {
 		case FALSE: // EAGAIN
 			revent = TR_eventSubjectEmit(
diff --git a/src/protocol_handler.c b/src/protocol_handler.c
index d61155b..95dfd3f 100644
--- a/src/protocol_handler.c
+++ b/src/protocol_handler.c
@@ -32,8 +32,6 @@
 #include "tr/comm_end_point.h"
 #include "tr/interface/comm_end_point.h"
 
-int count_write_ready = 0;
-
 static
 int
 protocolHandlerCtor(void * _this, va_list * params)
@@ -93,8 +91,6 @@ protocolHandlerCompose(void * _this, TR_Event event)
 				NULL);
 
 		TR_eventHandlerIssueEvent((TR_EventHandler)_this, _event);
-
-		count_write_ready++;
 	} else {
 		//printf("%s: compose failed\n", __func__);
 	}
diff --git a/testers/testclient.sh b/testers/testclient.sh
index 1f02e3b..4429a54 100755
--- a/testers/testclient.sh
+++ b/testers/testclient.sh
@@ -2,9 +2,9 @@
 
 pids=""
 i=0
-while [ $i -lt 20 ]
+while [ $i -lt 100 ]
 do
-	dd if=/dev/zero bs=8192 count=25000 | nc localhost 5678 &
+	dd if=/dev/zero bs=8192 count=25000 | nc 192.168.2.13 5678 &
 	pids="${pids} $!"
 	i=$((i + 1))
 done