diff --git a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/CassandraClientBase.java b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/CassandraClientBase.java
index 0742c2aea..12fb77b4a 100644
--- a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/CassandraClientBase.java
+++ b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/CassandraClientBase.java
@@ -85,7 +85,6 @@
 import com.impetus.kundera.metadata.model.KunderaMetadata;
 import com.impetus.kundera.metadata.model.MetamodelImpl;
 import com.impetus.kundera.metadata.model.PersistenceUnitMetadata;
-import com.impetus.kundera.persistence.api.Batcher;
 import com.impetus.kundera.property.PropertyAccessException;
 import com.impetus.kundera.property.PropertyAccessorFactory;
 import com.impetus.kundera.property.PropertyAccessorHelper;
diff --git a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/config/CassandraPropertyReader.java b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/config/CassandraPropertyReader.java
index 545fa443b..11557f8f3 100644
--- a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/config/CassandraPropertyReader.java
+++ b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/config/CassandraPropertyReader.java
@@ -31,8 +31,8 @@
 import com.impetus.client.cassandra.schemamanager.CassandraValidationClassMapper;
 import com.impetus.kundera.configure.AbstractPropertyReader;
 import com.impetus.kundera.configure.ClientProperties;
-import com.impetus.kundera.configure.PropertyReader;
 import com.impetus.kundera.configure.ClientProperties.DataStore;
+import com.impetus.kundera.configure.PropertyReader;
 
 /**
  * Cassandra Property Reader reads cassandra properties from property file
diff --git a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/pelops/PelopsClientFactory.java b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/pelops/PelopsClientFactory.java
index 3a9f96cdd..d7b37a193 100644
--- a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/pelops/PelopsClientFactory.java
+++ b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/pelops/PelopsClientFactory.java
@@ -29,7 +29,6 @@
 import com.impetus.client.cassandra.schemamanager.CassandraSchemaManager;
 import com.impetus.kundera.PersistenceProperties;
 import com.impetus.kundera.client.Client;
-import com.impetus.kundera.configure.AbstractPropertyReader;
 import com.impetus.kundera.configure.schema.api.SchemaManager;
 import com.impetus.kundera.loader.GenericClientFactory;
 import com.impetus.kundera.metadata.model.KunderaMetadata;
diff --git a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/pelops/PelopsUtils.java b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/pelops/PelopsUtils.java
index 603d6d57c..8bcf189f8 100644
--- a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/pelops/PelopsUtils.java
+++ b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/pelops/PelopsUtils.java
@@ -17,7 +17,6 @@
 
 import java.util.Properties;
 
-import org.apache.cassandra.thrift.Cassandra;
 import org.apache.commons.lang.StringUtils;
 import org.scale7.cassandra.pelops.Pelops;
 import org.scale7.cassandra.pelops.SimpleConnectionAuthenticator;
diff --git a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/query/CassandraEntityReader.java b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/query/CassandraEntityReader.java
index d59fe6a95..7d89105a0 100644
--- a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/query/CassandraEntityReader.java
+++ b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/query/CassandraEntityReader.java
@@ -17,7 +17,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
diff --git a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/thrift/ThriftClientFactory.java b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/thrift/ThriftClientFactory.java
index 12976d697..54d853287 100644
--- a/kundera-cassandra/src/main/java/com/impetus/client/cassandra/thrift/ThriftClientFactory.java
+++ b/kundera-cassandra/src/main/java/com/impetus/client/cassandra/thrift/ThriftClientFactory.java
@@ -21,8 +21,6 @@
 import org.scale7.cassandra.pelops.IConnection;
 import org.scale7.cassandra.pelops.Pelops;
 import org.scale7.cassandra.pelops.pool.CommonsBackedPool.Policy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.impetus.client.cassandra.config.CassandraPropertyReader;
 import com.impetus.client.cassandra.pelops.PelopsClientFactory;
diff --git a/kundera-cassandra/src/test/java/com/impetus/client/crud/datatypes/StudentCassandraBooleanTest.java b/kundera-cassandra/src/test/java/com/impetus/client/crud/datatypes/StudentCassandraBooleanTest.java
index 2f9ddc34d..384057c63 100644
--- a/kundera-cassandra/src/test/java/com/impetus/client/crud/datatypes/StudentCassandraBooleanTest.java
+++ b/kundera-cassandra/src/test/java/com/impetus/client/crud/datatypes/StudentCassandraBooleanTest.java
@@ -28,8 +28,6 @@
 import org.junit.Test;
 
 import com.impetus.client.crud.datatypes.entities.StudentCassandraBoolean;
-import com.impetus.client.crud.datatypes.entities.StudentCassandraBoolean;
-import com.impetus.client.crud.datatypes.entities.StudentCassandraboolean;
 import com.impetus.client.persistence.CassandraCli;
 import com.impetus.kundera.query.QueryHandlerException;
 
diff --git a/kundera-cassandra/src/test/java/com/impetus/client/crud/datatypes/StudentCassandraStringTest.java b/kundera-cassandra/src/test/java/com/impetus/client/crud/datatypes/StudentCassandraStringTest.java
index d20528972..aaa16f053 100644
--- a/kundera-cassandra/src/test/java/com/impetus/client/crud/datatypes/StudentCassandraStringTest.java
+++ b/kundera-cassandra/src/test/java/com/impetus/client/crud/datatypes/StudentCassandraStringTest.java
@@ -27,7 +27,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.impetus.client.crud.datatypes.entities.StudentCassandraString;
 import com.impetus.client.crud.datatypes.entities.StudentCassandraString;
 import com.impetus.client.persistence.CassandraCli;
 
diff --git a/kundera-cassandra/src/test/java/com/impetus/client/persistence/NullableFieldAccessorTest.java b/kundera-cassandra/src/test/java/com/impetus/client/persistence/NullableFieldAccessorTest.java
index 86f2c0a69..9e75b25ce 100644
--- a/kundera-cassandra/src/test/java/com/impetus/client/persistence/NullableFieldAccessorTest.java
+++ b/kundera-cassandra/src/test/java/com/impetus/client/persistence/NullableFieldAccessorTest.java
@@ -34,7 +34,6 @@
 import com.impetus.kundera.Constants;
 import com.impetus.kundera.PersistenceProperties;
 import com.impetus.kundera.configure.ClientFactoryConfiguraton;
-import com.impetus.kundera.configure.Configurator;
 import com.impetus.kundera.metadata.model.ApplicationMetadata;
 import com.impetus.kundera.metadata.model.EntityMetadata;
 import com.impetus.kundera.metadata.model.KunderaMetadata;