diff --git a/redisson/src/main/java/org/redisson/spring/session/ReactiveRedissonSessionRepository.java b/redisson/src/main/java/org/redisson/spring/session/ReactiveRedissonSessionRepository.java
index ebaab9a3f..93b877236 100644
--- a/redisson/src/main/java/org/redisson/spring/session/ReactiveRedissonSessionRepository.java
+++ b/redisson/src/main/java/org/redisson/spring/session/ReactiveRedissonSessionRepository.java
@@ -19,7 +19,6 @@ import org.redisson.api.RedissonClient;
 import org.redisson.spring.session.RedissonSessionRepository.RedissonSession;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.session.ReactiveSessionRepository;
-
 import reactor.core.publisher.Mono;
 
 /**
diff --git a/redisson/src/main/java/org/redisson/spring/session/RedissonSessionRepository.java b/redisson/src/main/java/org/redisson/spring/session/RedissonSessionRepository.java
index 94c852d14..fbc3a00d3 100644
--- a/redisson/src/main/java/org/redisson/spring/session/RedissonSessionRepository.java
+++ b/redisson/src/main/java/org/redisson/spring/session/RedissonSessionRepository.java
@@ -15,24 +15,7 @@
  */
 package org.redisson.spring.session;
 
-import java.time.Duration;
-import java.time.Instant;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.redisson.api.BatchOptions;
-import org.redisson.api.BatchResult;
-import org.redisson.api.RBatch;
-import org.redisson.api.RMap;
-import org.redisson.api.RPatternTopic;
-import org.redisson.api.RSet;
-import org.redisson.api.RTopic;
-import org.redisson.api.RedissonClient;
+import org.redisson.api.*;
 import org.redisson.api.listener.PatternMessageListener;
 import org.redisson.client.codec.StringCodec;
 import org.redisson.codec.CompositeCodec;
@@ -50,6 +33,12 @@ import org.springframework.session.events.SessionDeletedEvent;
 import org.springframework.session.events.SessionExpiredEvent;
 import org.springframework.util.StringUtils;
 
+import java.time.Duration;
+import java.time.Instant;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
 /**
  * Deprecated. Use spring-session implementation based on Redisson Redis Data module
  *
diff --git a/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonHttpSession.java b/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonHttpSession.java
index a13e3605b..9c7397547 100644
--- a/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonHttpSession.java
+++ b/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonHttpSession.java
@@ -15,16 +15,15 @@
  */
 package org.redisson.spring.session.config;
 
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.session.MapSession;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.session.MapSession;
-import org.springframework.session.web.http.SessionRepositoryFilter;
-
 /**
  * Deprecated. Use spring-session implementation based on Redisson Redis Data module
  *
diff --git a/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonWebSession.java b/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonWebSession.java
index b80cb7880..b8c542650 100644
--- a/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonWebSession.java
+++ b/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonWebSession.java
@@ -15,16 +15,15 @@
  */
 package org.redisson.spring.session.config;
 
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.session.MapSession;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.session.MapSession;
-import org.springframework.web.server.session.WebSessionManager;
-
 /**
  * Deprecated. Use spring-session implementation based on Redisson Redis Data module
  * 
diff --git a/redisson/src/main/java/org/redisson/spring/session/config/RedissonHttpSessionConfiguration.java b/redisson/src/main/java/org/redisson/spring/session/config/RedissonHttpSessionConfiguration.java
index a7d07ea4c..70a1ffefd 100644
--- a/redisson/src/main/java/org/redisson/spring/session/config/RedissonHttpSessionConfiguration.java
+++ b/redisson/src/main/java/org/redisson/spring/session/config/RedissonHttpSessionConfiguration.java
@@ -15,8 +15,6 @@
  */
 package org.redisson.spring.session.config;
 
-import java.util.Map;
-
 import org.redisson.api.RedissonClient;
 import org.redisson.spring.session.RedissonSessionRepository;
 import org.springframework.context.ApplicationEventPublisher;
@@ -26,7 +24,8 @@ import org.springframework.context.annotation.ImportAware;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.session.config.annotation.web.http.SpringHttpSessionConfiguration;
-import org.springframework.session.web.http.SessionRepositoryFilter;
+
+import java.util.Map;
 
 /**
  * Deprecated. Use spring-session implementation based on Redisson Redis Data module
diff --git a/redisson/src/main/java/org/redisson/spring/session/config/RedissonWebSessionConfiguration.java b/redisson/src/main/java/org/redisson/spring/session/config/RedissonWebSessionConfiguration.java
index 2e84ec4f0..6558c19d2 100644
--- a/redisson/src/main/java/org/redisson/spring/session/config/RedissonWebSessionConfiguration.java
+++ b/redisson/src/main/java/org/redisson/spring/session/config/RedissonWebSessionConfiguration.java
@@ -15,8 +15,6 @@
  */
 package org.redisson.spring.session.config;
 
-import java.util.Map;
-
 import org.redisson.api.RedissonClient;
 import org.redisson.spring.session.ReactiveRedissonSessionRepository;
 import org.springframework.context.ApplicationEventPublisher;
@@ -26,7 +24,8 @@ import org.springframework.context.annotation.ImportAware;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.session.config.annotation.web.server.SpringWebSessionConfiguration;
-import org.springframework.web.server.session.WebSessionManager;
+
+import java.util.Map;
 
 /**
  * Deprecated. Use spring-session implementation based on Redisson Redis Data module