diff --git a/redisson/src/main/java/org/redisson/RedissonSetMultimap.java b/redisson/src/main/java/org/redisson/RedissonSetMultimap.java
index b5f319516..79fe55771 100644
--- a/redisson/src/main/java/org/redisson/RedissonSetMultimap.java
+++ b/redisson/src/main/java/org/redisson/RedissonSetMultimap.java
@@ -35,8 +35,6 @@ import org.redisson.client.protocol.convertor.BooleanAmountReplayConvertor;
 import org.redisson.client.protocol.convertor.BooleanReplayConvertor;
 import org.redisson.command.CommandAsyncExecutor;
 
-import io.netty.util.concurrent.Future;
-
 /**
  * @author Nikita Koksharov
  *
diff --git a/redisson/src/main/java/org/redisson/api/RLiveObjectService.java b/redisson/src/main/java/org/redisson/api/RLiveObjectService.java
index 9d301675a..329956837 100644
--- a/redisson/src/main/java/org/redisson/api/RLiveObjectService.java
+++ b/redisson/src/main/java/org/redisson/api/RLiveObjectService.java
@@ -208,7 +208,7 @@ public interface RLiveObjectService {
      * 
      * @param cls 
      */
-    void registerClass(Class cls);
+    void registerClass(Class<?> cls);
     
     /**
      * Unregister the class with the service. This is useful after you decide
@@ -227,7 +227,7 @@ public interface RLiveObjectService {
      * 
      * @param cls It can be either the proxied class or the unproxied conterpart.
      */
-    void unregisterClass(Class cls);
+    void unregisterClass(Class<?> cls);
     
     /**
      * Check if the class is registered in the cache. 
@@ -242,5 +242,5 @@ public interface RLiveObjectService {
      * @param cls
      * @return 
      */
-    boolean isClassRegistered(Class cls);
+    boolean isClassRegistered(Class<?> cls);
 }
diff --git a/redisson/src/main/java/org/redisson/api/RRemoteService.java b/redisson/src/main/java/org/redisson/api/RRemoteService.java
index 3685e9663..fb0333a05 100644
--- a/redisson/src/main/java/org/redisson/api/RRemoteService.java
+++ b/redisson/src/main/java/org/redisson/api/RRemoteService.java
@@ -15,7 +15,6 @@
  */
 package org.redisson.api;
 
-import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
diff --git a/redisson/src/main/java/org/redisson/api/RemoteInvocationOptions.java b/redisson/src/main/java/org/redisson/api/RemoteInvocationOptions.java
index 6fa3e48c1..044c5c9ac 100644
--- a/redisson/src/main/java/org/redisson/api/RemoteInvocationOptions.java
+++ b/redisson/src/main/java/org/redisson/api/RemoteInvocationOptions.java
@@ -58,6 +58,8 @@ import java.util.concurrent.TimeUnit;
  */
 public class RemoteInvocationOptions implements Serializable {
 
+    private static final long serialVersionUID = -7715968073286484802L;
+    
     private Long ackTimeoutInMillis;
     private Long executionTimeoutInMillis;
 
diff --git a/redisson/src/main/java/org/redisson/api/listener/BasePatternStatusListener.java b/redisson/src/main/java/org/redisson/api/listener/BasePatternStatusListener.java
index b59bc1011..40ca5b3be 100644
--- a/redisson/src/main/java/org/redisson/api/listener/BasePatternStatusListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/BasePatternStatusListener.java
@@ -15,8 +15,6 @@
  */
 package org.redisson.api.listener;
 
-import org.redisson.api.RTopic;
-
 /**
  * Base status listener for Redis PubSub channel status changes
  *
diff --git a/redisson/src/main/java/org/redisson/api/listener/BaseStatusListener.java b/redisson/src/main/java/org/redisson/api/listener/BaseStatusListener.java
index 8d900e33b..658f0fc3b 100644
--- a/redisson/src/main/java/org/redisson/api/listener/BaseStatusListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/BaseStatusListener.java
@@ -15,8 +15,6 @@
  */
 package org.redisson.api.listener;
 
-import org.redisson.api.RTopic;
-
 /**
  * Base status listener for Redis PubSub channel status changes
  *
diff --git a/redisson/src/main/java/org/redisson/api/listener/MessageListener.java b/redisson/src/main/java/org/redisson/api/listener/MessageListener.java
index bc222f1d7..9d28e65dc 100644
--- a/redisson/src/main/java/org/redisson/api/listener/MessageListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/MessageListener.java
@@ -17,8 +17,6 @@ package org.redisson.api.listener;
 
 import java.util.EventListener;
 
-import org.redisson.api.RTopic;
-
 /**
  * Listener for Redis messages published via RTopic Redisson object
  *
diff --git a/redisson/src/main/java/org/redisson/api/listener/PatternMessageListener.java b/redisson/src/main/java/org/redisson/api/listener/PatternMessageListener.java
index 01dcbf581..8ace2607d 100644
--- a/redisson/src/main/java/org/redisson/api/listener/PatternMessageListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/PatternMessageListener.java
@@ -17,8 +17,6 @@ package org.redisson.api.listener;
 
 import java.util.EventListener;
 
-import org.redisson.api.RTopic;
-
 /**
  * Listener for Redis messages published via RTopic Redisson object
  *
diff --git a/redisson/src/main/java/org/redisson/api/listener/PatternStatusListener.java b/redisson/src/main/java/org/redisson/api/listener/PatternStatusListener.java
index 30ed7136e..c476a1737 100644
--- a/redisson/src/main/java/org/redisson/api/listener/PatternStatusListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/PatternStatusListener.java
@@ -17,8 +17,6 @@ package org.redisson.api.listener;
 
 import java.util.EventListener;
 
-import org.redisson.api.RTopic;
-
 /**
  * Listener for Redis PubSub channel status changes
  *
diff --git a/redisson/src/main/java/org/redisson/api/listener/StatusListener.java b/redisson/src/main/java/org/redisson/api/listener/StatusListener.java
index 2e497c2c5..25521e7f6 100644
--- a/redisson/src/main/java/org/redisson/api/listener/StatusListener.java
+++ b/redisson/src/main/java/org/redisson/api/listener/StatusListener.java
@@ -17,8 +17,6 @@ package org.redisson.api.listener;
 
 import java.util.EventListener;
 
-import org.redisson.api.RTopic;
-
 /**
  * Listener for Redis PubSub channel status changes
  *