diff --git a/src/main/java/com/corundumstudio/socketio/Configuration.java b/src/main/java/com/corundumstudio/socketio/Configuration.java
index 738e48b..74d7463 100644
--- a/src/main/java/com/corundumstudio/socketio/Configuration.java
+++ b/src/main/java/com/corundumstudio/socketio/Configuration.java
@@ -43,7 +43,6 @@ public class Configuration {
 
     private int pollingDuration = 20;
 
-    private int heartbeatThreadPoolSize = Runtime.getRuntime().availableProcessors() * 2;
     private int heartbeatTimeout = 60;
     private int heartbeatInterval = 25;
     private int closeTimeout = 60;
@@ -80,7 +79,6 @@ public class Configuration {
         setCloseTimeout(conf.getCloseTimeout());
 
         setHeartbeatInterval(conf.getHeartbeatInterval());
-        setHeartbeatThreadPoolSize(conf.getHeartbeatThreadPoolSize());
         setHeartbeatTimeout(conf.getHeartbeatTimeout());
 
         setHostname(conf.getHostname());
@@ -202,19 +200,6 @@ public class Configuration {
         return heartbeatTimeout > 0;
     }
 
-    /**
-     * Heartbeat thread pool size
-     *
-     * @param value
-     *            - threads amount
-     */
-    public void setHeartbeatThreadPoolSize(int heartbeatThreadPoolSize) {
-        this.heartbeatThreadPoolSize = heartbeatThreadPoolSize;
-    }
-    public int getHeartbeatThreadPoolSize() {
-        return heartbeatThreadPoolSize;
-    }
-
     /**
      * Channel close timeout due inactivity
      *
diff --git a/src/main/java/com/corundumstudio/socketio/scheduler/HashedWheelScheduler.java b/src/main/java/com/corundumstudio/socketio/scheduler/HashedWheelScheduler.java
index bb57033..d29abfc 100644
--- a/src/main/java/com/corundumstudio/socketio/scheduler/HashedWheelScheduler.java
+++ b/src/main/java/com/corundumstudio/socketio/scheduler/HashedWheelScheduler.java
@@ -31,7 +31,7 @@ public class HashedWheelScheduler implements CancelableScheduler {
     private volatile ChannelHandlerContext ctx;
 
     @Override
-    public void update(ChannelHandlerContext ctx) throws Exception {
+    public void update(ChannelHandlerContext ctx) {
         this.ctx = ctx;
     }