diff --git a/zanata-cli/src/main/java/org/zanata/client/ZanataClient.java b/zanata-cli/src/main/java/org/zanata/client/ZanataClient.java
index ca27d12b..e6097fdc 100644
--- a/zanata-cli/src/main/java/org/zanata/client/ZanataClient.java
+++ b/zanata-cli/src/main/java/org/zanata/client/ZanataClient.java
@@ -14,7 +14,6 @@
 import org.zanata.client.commands.ArgsUtil;
 import org.zanata.client.commands.BasicOptions;
 import org.zanata.client.commands.BasicOptionsImpl;
-import org.zanata.client.commands.ListLocalOptionsImpl;
 import org.zanata.client.commands.ListRemoteOptionsImpl;
 import org.zanata.client.commands.PutProjectOptionsImpl;
 import org.zanata.client.commands.PutUserOptionsImpl;
diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
index 66051aae..03b734a7 100644
--- a/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
+++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
@@ -5,21 +5,12 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
-import java.security.KeyStore;
-import java.security.SecureRandom;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.net.ssl.X509TrustManager;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.Response;
 
@@ -43,9 +34,6 @@
 import org.zanata.rest.dto.resource.Resource;
 import org.zanata.rest.dto.resource.TranslationsResource;
 import org.zanata.util.HashUtil;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
 
 /**
  * @author Sean Flanigan <a
diff --git a/zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsOptionsImpl.java b/zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsOptionsImpl.java
index 730365a8..63b10346 100644
--- a/zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsOptionsImpl.java
+++ b/zanata-client-commands/src/main/java/org/zanata/client/commands/stats/GetStatisticsOptionsImpl.java
@@ -20,12 +20,9 @@
  */
 package org.zanata.client.commands.stats;
 
-import java.io.File;
-
 import org.kohsuke.args4j.Option;
 import org.zanata.client.commands.ConfigurableProjectOptionsImpl;
 import org.zanata.client.commands.ZanataCommand;
-import org.zanata.client.config.LocaleList;
 
 /**
  * @author Carlos Munoz <a href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
diff --git a/zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCache.java b/zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCache.java
index 6ad03db8..1fb62f21 100644
--- a/zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCache.java
+++ b/zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCache.java
@@ -21,16 +21,9 @@
 package org.zanata.client.etag;
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
 import org.apache.commons.collections.keyvalue.MultiKey;
 
 /**
diff --git a/zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCacheReaderWriter.java b/zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCacheReaderWriter.java
index 47c0c2d7..81eb33be 100644
--- a/zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCacheReaderWriter.java
+++ b/zanata-client-commands/src/main/java/org/zanata/client/etag/ETagCacheReaderWriter.java
@@ -20,7 +20,6 @@
  */
 package org.zanata.client.etag;
 
-import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
 import javax.xml.bind.JAXBContext;
diff --git a/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PropertiesPullStrategyTest.java b/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PropertiesPullStrategyTest.java
index 2f1ca7fb..7e3da4bc 100644
--- a/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PropertiesPullStrategyTest.java
+++ b/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PropertiesPullStrategyTest.java
@@ -6,7 +6,6 @@
 import java.io.InputStreamReader;
 
 import org.fedorahosted.openprops.Properties;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PropertiesPushStrategyTest.java b/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PropertiesPushStrategyTest.java
index d1e05a86..f5e2641b 100644
--- a/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PropertiesPushStrategyTest.java
+++ b/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PropertiesPushStrategyTest.java
@@ -10,7 +10,6 @@
 import java.io.Writer;
 
 import org.fedorahosted.openprops.Properties;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
diff --git a/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java b/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
index 88a705e7..19249a55 100644
--- a/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
+++ b/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
@@ -15,7 +15,6 @@
 import javax.ws.rs.core.Response.Status;
 
 import org.jboss.resteasy.client.ClientResponse;
-import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.zanata.client.commands.DummyResponse;
diff --git a/zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java b/zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
index 37690e80..7d8bfad8 100644
--- a/zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
+++ b/zanata-client-commands/src/test/java/org/zanata/client/config/ConfigUtilTest.java
@@ -5,7 +5,6 @@
 
 import org.apache.commons.configuration.HierarchicalINIConfiguration;
 import org.apache.commons.configuration.SubnodeConfiguration;
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java b/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
index 04e5dba3..c65d9967 100644
--- a/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
+++ b/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
@@ -26,7 +26,6 @@
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.spi.interception.ClientExecutionContext;
-import org.junit.Assert;
 import org.junit.Test;
 import org.zanata.rest.RestConstant;