diff --git a/impl/src/main/java/org/jboss/seam/social/linkedin/LinkedInHanlderBean.java b/impl/src/main/java/org/jboss/seam/social/linkedin/LinkedInHanlderBean.java
index abb3bef..c63b465 100644
--- a/impl/src/main/java/org/jboss/seam/social/linkedin/LinkedInHanlderBean.java
+++ b/impl/src/main/java/org/jboss/seam/social/linkedin/LinkedInHanlderBean.java
@@ -16,8 +16,6 @@
  */
 package org.jboss.seam.social.linkedin;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.inject.Typed;
 import javax.inject.Inject;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -26,9 +24,8 @@
 import org.jboss.seam.social.oauth.HttpResponse;
 import org.jboss.seam.social.oauth.OAuthServiceHandlerScribe;
 import org.jboss.seam.social.oauth.OAuthServiceSettings;
-import org.jboss.seam.social.oauth.User;
 import org.jboss.seam.social.oauth.RestVerb;
-import org.jboss.seam.social.twitter.model.TwitterCredentialJackson;
+import org.jboss.seam.social.oauth.User;
 import org.scribe.builder.api.Api;
 import org.scribe.builder.api.LinkedInApi;
 
diff --git a/impl/src/main/java/org/jboss/seam/social/linkedin/LinkedInProducer.java b/impl/src/main/java/org/jboss/seam/social/linkedin/LinkedInProducer.java
index 394c49f..5575cfc 100644
--- a/impl/src/main/java/org/jboss/seam/social/linkedin/LinkedInProducer.java
+++ b/impl/src/main/java/org/jboss/seam/social/linkedin/LinkedInProducer.java
@@ -16,10 +16,8 @@
  */
 package org.jboss.seam.social.linkedin;
 
-import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.jboss.seam.social.oauth.Setted;
 import org.jboss.seam.social.oauth.SettedHandlerProducer;
 
 /**
diff --git a/impl/src/main/java/org/jboss/seam/social/oauth/OAuthServiceHandlerScribe.java b/impl/src/main/java/org/jboss/seam/social/oauth/OAuthServiceHandlerScribe.java
index 616f94f..6a6de15 100644
--- a/impl/src/main/java/org/jboss/seam/social/oauth/OAuthServiceHandlerScribe.java
+++ b/impl/src/main/java/org/jboss/seam/social/oauth/OAuthServiceHandlerScribe.java
@@ -24,7 +24,6 @@
 import org.scribe.builder.ServiceBuilder;
 import org.scribe.builder.api.Api;
 import org.scribe.model.OAuthRequest;
-import org.scribe.model.Token;
 import org.scribe.model.Verb;
 import org.scribe.model.Verifier;
 import org.scribe.oauth.OAuthService;
diff --git a/impl/src/main/java/org/jboss/seam/social/twitter/TwitterHandlerBean.java b/impl/src/main/java/org/jboss/seam/social/twitter/TwitterHandlerBean.java
index a693220..6d11e18 100644
--- a/impl/src/main/java/org/jboss/seam/social/twitter/TwitterHandlerBean.java
+++ b/impl/src/main/java/org/jboss/seam/social/twitter/TwitterHandlerBean.java
@@ -16,15 +16,14 @@
  */
 package org.jboss.seam.social.twitter;
 
-import javax.enterprise.inject.Typed;
 import javax.inject.Inject;
 
-import org.jboss.seam.social.oauth.JsonMapper;
-import org.jboss.seam.social.oauth.User;
 import org.jboss.seam.social.oauth.HttpResponse;
+import org.jboss.seam.social.oauth.JsonMapper;
 import org.jboss.seam.social.oauth.OAuthServiceHandlerScribe;
 import org.jboss.seam.social.oauth.OAuthServiceSettings;
 import org.jboss.seam.social.oauth.RestVerb;
+import org.jboss.seam.social.oauth.User;
 import org.jboss.seam.social.twitter.model.Tweet;
 import org.jboss.seam.social.twitter.model.TweetJackson;
 import org.jboss.seam.social.twitter.model.TwitterCredentialJackson;
diff --git a/impl/src/main/java/org/jboss/seam/social/twitter/TwitterProducer.java b/impl/src/main/java/org/jboss/seam/social/twitter/TwitterProducer.java
index 777ba85..5fd1caa 100644
--- a/impl/src/main/java/org/jboss/seam/social/twitter/TwitterProducer.java
+++ b/impl/src/main/java/org/jboss/seam/social/twitter/TwitterProducer.java
@@ -16,10 +16,8 @@
  */
 package org.jboss.seam.social.twitter;
 
-import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import org.jboss.seam.social.oauth.Setted;
 import org.jboss.seam.social.oauth.SettedHandlerProducer;
 
 /**
diff --git a/impl/src/main/java/org/jboss/seam/social/twitter/model/SearchResultJackson.java b/impl/src/main/java/org/jboss/seam/social/twitter/model/SearchResultJackson.java
index 7870724..19697e1 100644
--- a/impl/src/main/java/org/jboss/seam/social/twitter/model/SearchResultJackson.java
+++ b/impl/src/main/java/org/jboss/seam/social/twitter/model/SearchResultJackson.java
@@ -20,8 +20,6 @@
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.annotate.JsonProperty;
-import org.jboss.seam.social.twitter.model.SearchResult;
-import org.jboss.seam.social.twitter.model.Tweet;
 
 @JsonIgnoreProperties(ignoreUnknown=true)
 public class SearchResultJackson implements SearchResult
diff --git a/impl/src/main/java/org/jboss/seam/social/twitter/model/TweetJackson.java b/impl/src/main/java/org/jboss/seam/social/twitter/model/TweetJackson.java
index b20c3eb..3225afd 100644
--- a/impl/src/main/java/org/jboss/seam/social/twitter/model/TweetJackson.java
+++ b/impl/src/main/java/org/jboss/seam/social/twitter/model/TweetJackson.java
@@ -18,7 +18,6 @@
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.annotate.JsonProperty;
-import org.jboss.seam.social.twitter.model.Tweet;
 
 @JsonIgnoreProperties(ignoreUnknown=true)
 public class TweetJackson implements Tweet
diff --git a/impl/src/main/java/org/jboss/seam/social/twitter/model/TwitterCredentialJackson.java b/impl/src/main/java/org/jboss/seam/social/twitter/model/TwitterCredentialJackson.java
index 01d339d..1c8c667 100644
--- a/impl/src/main/java/org/jboss/seam/social/twitter/model/TwitterCredentialJackson.java
+++ b/impl/src/main/java/org/jboss/seam/social/twitter/model/TwitterCredentialJackson.java
@@ -18,8 +18,6 @@
 
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 import org.codehaus.jackson.annotate.JsonProperty;
-import org.jboss.seam.social.oauth.User;
-import org.jboss.seam.social.twitter.model.TwitterCredential;
 
 /**
  *