diff --git a/src/main/java/org/redisson/Redisson.java b/src/main/java/org/redisson/Redisson.java
index a858fcbc5..9491e87f2 100644
--- a/src/main/java/org/redisson/Redisson.java
+++ b/src/main/java/org/redisson/Redisson.java
@@ -16,6 +16,7 @@
 package org.redisson;
 
 import java.util.Map.Entry;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -56,6 +57,8 @@ public class Redisson {
 
     private final ConnectionManager connectionManager;
 
+    private final UUID id = UUID.randomUUID();
+
     public Redisson(Config config) {
         connectionManager = new ConnectionManager(config);
     }
@@ -99,7 +102,7 @@ public class Redisson {
     public RLock getLock(String name) {
         RedissonLock lock = locksMap.get(name);
         if (lock == null) {
-            lock = new RedissonLock(connectionManager, name);
+            lock = new RedissonLock(connectionManager, name, id);
             RedissonLock oldLock = locksMap.putIfAbsent(name, lock);
             if (oldLock != null) {
                 lock = oldLock;
diff --git a/src/main/java/org/redisson/RedissonLock.java b/src/main/java/org/redisson/RedissonLock.java
index 57b5c22aa..eaf359f21 100644
--- a/src/main/java/org/redisson/RedissonLock.java
+++ b/src/main/java/org/redisson/RedissonLock.java
@@ -102,8 +102,7 @@ public class RedissonLock implements RLock {
 
     private final ConnectionManager connectionManager;
 
-    // TODO move it to Redisson as ID
-    private final UUID id = UUID.randomUUID();
+    private final UUID id;
     private final String groupName = "redisson_lock_";
     private final String name;
 
@@ -116,9 +115,10 @@ public class RedissonLock implements RLock {
 
     private PubSubEntry pubSubEntry;
 
-    RedissonLock(ConnectionManager connectionManager, String name) {
+    RedissonLock(ConnectionManager connectionManager, String name, UUID id) {
         this.connectionManager = connectionManager;
         this.name = name;
+        this.id = id;
     }
 
     public void subscribe() {
@@ -239,7 +239,6 @@ public class RedissonLock implements RLock {
         } finally {
             connectionManager.release(connection);
         }
-
     }
 
     @Override
diff --git a/src/main/java/org/redisson/config/Config.java b/src/main/java/org/redisson/config/Config.java
index 5c84c13db..e2714a917 100644
--- a/src/main/java/org/redisson/config/Config.java
+++ b/src/main/java/org/redisson/config/Config.java
@@ -15,14 +15,10 @@
  */
 package org.redisson.config;
 
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import com.lambdaworks.redis.codec.JsonJacksonCodec;
 import com.lambdaworks.redis.codec.RedisCodec;