diff --git a/src/main/java/org/redisson/client/RedisConnection.java b/src/main/java/org/redisson/client/RedisConnection.java
index 0133d9db5..85ff35041 100644
--- a/src/main/java/org/redisson/client/RedisConnection.java
+++ b/src/main/java/org/redisson/client/RedisConnection.java
@@ -98,6 +98,7 @@ public class RedisConnection implements RedisCommands {
     }
 
     public <R> R await(Future<R> cmd) {
+        // TODO change connectTimeout to timeout
         if (!cmd.awaitUninterruptibly(redisClient.getTimeout(), TimeUnit.MILLISECONDS)) {
             Promise<R> promise = (Promise<R>)cmd;
             RedisTimeoutException ex = new RedisTimeoutException("Command execution timeout for " + redisClient.getAddr());
diff --git a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
index ed414caa5..ac8024197 100644
--- a/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
+++ b/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
@@ -35,7 +35,6 @@ import org.redisson.ReadMode;
 import org.redisson.client.BaseRedisPubSubListener;
 import org.redisson.client.RedisClient;
 import org.redisson.client.RedisConnection;
-import org.redisson.client.RedisConnectionException;
 import org.redisson.client.RedisNodeNotFoundException;
 import org.redisson.client.RedisPubSubConnection;
 import org.redisson.client.RedisPubSubListener;