diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java
index fd23677bc3..86d98d0a1f 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImpl.java
@@ -19,15 +19,10 @@ import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.core.SqlParameter;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
-import org.springframework.jdbc.object.MappingSqlQuery;
-import org.springframework.jdbc.object.SqlUpdate;
 
-import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Types;
 import java.util.*;
 
 /**
diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
index 5fa8c46bc3..9d5ffd12ea 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/JdbcTokenRepositoryImplTests.java
@@ -44,7 +44,6 @@ import org.springframework.test.util.ReflectionTestUtils;
 /**
  * @author Luke Taylor
  */
-@SuppressWarnings("unchecked")
 @RunWith(MockitoJUnitRunner.class)
 public class JdbcTokenRepositoryImplTests {
     @Mock
@@ -145,7 +144,7 @@ public class JdbcTokenRepositoryImplTests {
 
         repo.removeUserTokens("joeuser");
 
-        List results = template.queryForList("select * from persistent_logins where username = 'joeuser'");
+        List<Map<String,Object>> results = template.queryForList("select * from persistent_logins where username = 'joeuser'");
 
         assertEquals(0, results.size());
     }
@@ -157,7 +156,7 @@ public class JdbcTokenRepositoryImplTests {
                 "('joesseries', 'joeuser', 'atoken', '" + ts.toString() + "')");
         repo.updateToken("joesseries", "newtoken", new Date());
 
-        Map results = template.queryForMap("select * from persistent_logins where series = 'joesseries'");
+        Map<String,Object> results = template.queryForMap("select * from persistent_logins where series = 'joesseries'");
 
         assertEquals("joeuser", results.get("username"));
         assertEquals("joesseries", results.get("series"));