diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
index 437406cf35..cc4a8ae371 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
@@ -41,12 +41,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class AtmosApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8067252472547486854L;
 
    public static final TypeToken<RestContext<AtmosClient, AtmosAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<AtmosClient, AtmosAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosResponseException.java b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosResponseException.java
index 31c5c63afa..738c0d2ac5 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosResponseException.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosResponseException.java
@@ -33,8 +33,6 @@ import org.jclouds.http.HttpResponseException;
  */
 public class AtmosResponseException extends HttpResponseException {
 
-   private static final long serialVersionUID = 1L;
-
    private AtmosError error;
 
    public AtmosResponseException(HttpCommand command, HttpResponse response,
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/BoundedLinkedHashSet.java b/apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/BoundedLinkedHashSet.java
index 7d5838cad5..7d2d4a5a29 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/BoundedLinkedHashSet.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/domain/internal/BoundedLinkedHashSet.java
@@ -34,8 +34,6 @@ import com.google.common.collect.Iterables;
  */
 public class BoundedLinkedHashSet<T> extends LinkedHashSet<T> implements BoundedSet<T> {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -7133632087734650835L;
    protected final String token;
 
    public BoundedLinkedHashSet(Iterable<T> contents, @Nullable String token) {
diff --git a/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java b/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
index eeaacee7ab..7629b0b78e 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/BYONApiMetadata.java
@@ -42,9 +42,6 @@ import com.google.inject.Module;
  */
 public class BYONApiMetadata extends BaseApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4059125995177393819L;
-
    @Override
    public Builder toBuilder() {
       return new Builder().fromApiMetadata(this);
diff --git a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
index 51d84d3e07..deca935df9 100644
--- a/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
+++ b/apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
@@ -43,11 +43,7 @@ import com.google.inject.TypeLiteral;
  */
 public class CloudFilesApiMetadata extends SwiftApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -1572520638079261710L;
-
    public static final TypeToken<RestContext<CloudFilesClient, CloudFilesAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudFilesClient, CloudFilesAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    private static Builder builder() {
diff --git a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersApiMetadata.java b/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersApiMetadata.java
index c0eab8d699..c0302df01b 100644
--- a/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersApiMetadata.java
+++ b/apis/cloudloadbalancers/src/main/java/org/jclouds/cloudloadbalancers/CloudLoadBalancersApiMetadata.java
@@ -38,15 +38,10 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class CloudLoadBalancersApiMetadata  extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<CloudLoadBalancersClient, CloudLoadBalancersAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudLoadBalancersClient, CloudLoadBalancersAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
-
    @Override
    public Builder toBuilder() {
       return new Builder().fromApiMetadata(this);
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersApiMetadata.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersApiMetadata.java
index 0fcc481b5a..98ea02ca8a 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersApiMetadata.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersApiMetadata.java
@@ -38,12 +38,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class CloudServersApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<CloudServersClient, CloudServersAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudServersClient, CloudServersAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java
index 40483f32fb..dd26f28663 100644
--- a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java
+++ b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java
@@ -41,11 +41,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class CloudSigmaApiMetadata extends BaseRestApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<CloudSigmaClient, CloudSigmaAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudSigmaClient, CloudSigmaAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/AsyncJobException.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/AsyncJobException.java
index 48004f655d..b2fd691ac3 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/AsyncJobException.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/AsyncJobException.java
@@ -23,8 +23,6 @@ package org.jclouds.cloudstack;
  */
 public class AsyncJobException extends RuntimeException {
 
-   private static final long serialVersionUID = -9174243454135616477L;
-
    public AsyncJobException() {
    }
 
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
index 6ac277d438..5017037524 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
@@ -51,11 +51,7 @@ import com.google.inject.Module;
  */
 public class CloudStackApiMetadata extends BaseRestApiMetadata {
    
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -3936131452958663245L;
-   
    public static final TypeToken<RestContext<CloudStackClient, CloudStackAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudStackClient, CloudStackAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java
index c6ecaa829c..c20519593b 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/strategy/BlockUntilJobCompletesAndReturnResult.java
@@ -68,7 +68,6 @@ public class BlockUntilJobCompletesAndReturnResult {
       if (jobWithResult.getError() != null)
          throw new UncheckedExecutionException(String.format("job %s failed with exception %s", job.getJobId(),
                jobWithResult.getError().toString())) {
-            private static final long serialVersionUID = 4371112085613620239L;
          };
       return jobWithResult.getResult();
    }
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java
index e6bc1e9906..63dbc30f20 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VirtualMachineClientLiveTest.java
@@ -165,7 +165,6 @@ public class VirtualMachineClientLiveTest extends BaseCloudStackClientLiveTest {
       if (jobWithResult.getError() != null)
          Throwables.propagate(new ExecutionException(String.format("job %s failed with exception %s", job.getId(),
                jobWithResult.getError().toString())) {
-            private static final long serialVersionUID = 4371112085613620239L;
          });
       VirtualMachine vm = jobWithResult.getResult();
       if (vm.isPasswordEnabled()) {
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
index c52cf597a9..1e8fc756a0 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
@@ -38,11 +38,7 @@ import com.google.common.reflect.TypeToken;
  */
 public class CloudWatchApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 3450830053589179249L;
-
    public static final TypeToken<RestContext<CloudWatchApi, CloudWatchAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudWatchApi, CloudWatchAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudApiMetadata.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudApiMetadata.java
index a442be2c27..df9ca77bc3 100644
--- a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudApiMetadata.java
+++ b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/DeltacloudApiMetadata.java
@@ -38,12 +38,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class DeltacloudApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<DeltacloudClient, DeltacloudAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<DeltacloudClient, DeltacloudAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/KeyAuthentication.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/KeyAuthentication.java
index 8573f1835c..a6960725ca 100644
--- a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/KeyAuthentication.java
+++ b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/KeyAuthentication.java
@@ -20,16 +20,13 @@ package org.jclouds.deltacloud.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.Serializable;
 
 /**
  * 
  * @author Adrian Cole
  */
-public class KeyAuthentication implements Instance.Authentication, Serializable {
+public class KeyAuthentication implements Instance.Authentication {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7669076186483470376L;
    private final String keyName;
 
    public KeyAuthentication(String keyName) {
diff --git a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/PasswordAuthentication.java b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/PasswordAuthentication.java
index 1297276247..3c4d2b77b3 100644
--- a/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/PasswordAuthentication.java
+++ b/apis/deltacloud/src/main/java/org/jclouds/deltacloud/domain/PasswordAuthentication.java
@@ -20,7 +20,6 @@ package org.jclouds.deltacloud.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.Serializable;
 
 import org.jclouds.domain.LoginCredentials;
 
@@ -28,10 +27,8 @@ import org.jclouds.domain.LoginCredentials;
  * 
  * @author Adrian Cole
  */
-public class PasswordAuthentication implements Instance.Authentication, Serializable {
+public class PasswordAuthentication implements Instance.Authentication {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7669076186483470376L;
    private final LoginCredentials login;
 
    public PasswordAuthentication(LoginCredentials login) {
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java b/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java
index cd836ac5ea..1f958db28c 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java
@@ -58,12 +58,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class EC2ApiMetadata extends BaseRestApiMetadata {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 4424763314988423886L;
    
    public static final TypeToken<RestContext<? extends EC2Client, ? extends EC2AsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<? extends EC2Client, ? extends EC2AsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiLiveTest.java
index 14920e6137..b968f961a5 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiLiveTest.java
@@ -20,7 +20,6 @@ public class BaseEC2ApiLiveTest extends BaseContextLiveTest<RestContext<? extend
    @Override
    protected TypeToken<RestContext<? extends EC2Api, ? extends EC2AsyncApi>> contextType() {
       return new TypeToken<RestContext<? extends EC2Api, ? extends EC2AsyncApi>>() {
-         private static final long serialVersionUID = -5070937833892503232L;
       };
    }
 
diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
index 5a619ea376..adec917d9c 100644
--- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
+++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
@@ -40,12 +40,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class ElasticStackApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<ElasticStackClient, ElasticStackAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<ElasticStackClient, ElasticStackAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/apis/eucalyptus/src/main/java/org/jclouds/eucalyptus/EucalyptusApiMetadata.java b/apis/eucalyptus/src/main/java/org/jclouds/eucalyptus/EucalyptusApiMetadata.java
index eea3f5e87c..0f0611044e 100644
--- a/apis/eucalyptus/src/main/java/org/jclouds/eucalyptus/EucalyptusApiMetadata.java
+++ b/apis/eucalyptus/src/main/java/org/jclouds/eucalyptus/EucalyptusApiMetadata.java
@@ -39,8 +39,6 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class EucalyptusApiMetadata extends EC2ApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 3060225665040763827L;
 
    private static Builder builder() {
       return new Builder();
diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java
index faac719944..d74dcc0064 100644
--- a/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java
+++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/FilesystemApiMetadata.java
@@ -31,9 +31,6 @@ import org.jclouds.filesystem.config.FilesystemBlobStoreContextModule;
  */
 public class FilesystemApiMetadata extends BaseApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2625620001657309404L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java
index 4eb5970785..1038fe3059 100644
--- a/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java
+++ b/apis/nova/src/main/java/org/jclouds/openstack/nova/NovaApiMetadata.java
@@ -38,12 +38,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class NovaApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<NovaClient, NovaAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<NovaClient, NovaAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java
index 3a0827a27c..a533142bc4 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java
@@ -45,10 +45,7 @@ import com.google.inject.Module;
  */
 public class CinderApiMetadata extends BaseRestApiMetadata {
    
-   private static final long serialVersionUID = 4525672099385581765L;
-
    public static final TypeToken<RestContext<CinderApi, CinderAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<CinderApi, CinderAsyncApi>>() {
-      private static final long serialVersionUID = -2850937833892503251L;
    };
 
    @Override
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java
index 68b2c7a90a..24bce70f0f 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java
@@ -45,12 +45,7 @@ import com.google.inject.Module;
  */
 public class KeystoneApiMetadata extends BaseRestApiMetadata {
    
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
-
-   
    public static final TypeToken<RestContext<? extends KeystoneApi,? extends  KeystoneAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<? extends KeystoneApi,? extends  KeystoneAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java
index f2faf87e63..3fc7db7f61 100644
--- a/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java
+++ b/apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2ApiMetadata.java
@@ -46,11 +46,7 @@ import com.google.inject.Module;
  */
 public class NovaEC2ApiMetadata extends EC2ApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -8539835226183747429L;
-
    public static final TypeToken<RestContext<NovaEC2Client, NovaEC2AsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<NovaEC2Client, NovaEC2AsyncClient>>() {
-      private static final long serialVersionUID = -6449920293625658712L;
    };
 
    private static Builder builder() {
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
index 0445321e51..087e94522d 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
@@ -49,12 +49,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class NovaApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<NovaApi, NovaAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<NovaApi, NovaAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
index 3f8b457ea0..402f4cda81 100644
--- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
+++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/CloudIdentityApiMetadata.java
@@ -46,11 +46,7 @@ import com.google.inject.Module;
  */
 public class CloudIdentityApiMetadata extends KeystoneApiMetadata {
    
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -1572520638079261710L;
-   
    public static final TypeToken<RestContext<KeystoneApi, KeystoneAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<KeystoneApi, KeystoneAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    private static Builder builder() {
diff --git a/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
index 3492c0d8ba..cc05de4944 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/S3ApiMetadata.java
@@ -61,12 +61,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class S3ApiMetadata extends BaseRestApiMetadata {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 820062881469203616L;
    
    public static final TypeToken<RestContext<? extends S3Client,? extends  S3AsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<? extends S3Client,? extends  S3AsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/BucketListObjectMetadata.java b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/BucketListObjectMetadata.java
index 349a2151bd..85a74faebb 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/BucketListObjectMetadata.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/BucketListObjectMetadata.java
@@ -20,7 +20,6 @@ package org.jclouds.s3.domain.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Date;
 import java.util.Map;
@@ -37,10 +36,7 @@ import com.google.common.collect.ImmutableMap;
  * 
  * @author Adrian Cole
  */
-public class BucketListObjectMetadata implements Serializable, ObjectMetadata {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4415449798024051115L;
+public class BucketListObjectMetadata implements ObjectMetadata {
 
    private final String key;
    private final String bucket;
diff --git a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/CopyObjectResult.java b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/CopyObjectResult.java
index b3cf9a28b0..d6c168d097 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/CopyObjectResult.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/CopyObjectResult.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.s3.domain.internal;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Date;
 import java.util.Map;
@@ -35,10 +34,7 @@ import com.google.common.collect.ImmutableMap;
  * 
  * @author Adrian Cole
  */
-public class CopyObjectResult implements Serializable, ObjectMetadata {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4415449798024051115L;
+public class CopyObjectResult implements ObjectMetadata {
 
    private final Date lastModified;
    private final String eTag;
diff --git a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/ListBucketResponseImpl.java b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/ListBucketResponseImpl.java
index 7c84b1c4e6..4dcdefb843 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/ListBucketResponseImpl.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/ListBucketResponseImpl.java
@@ -32,8 +32,7 @@ import com.google.common.collect.Iterables;
  * 
  */
 public class ListBucketResponseImpl extends LinkedHashSet<ObjectMetadata> implements ListBucketResponse {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4475709781001190244L;
+
    protected final String name;
    protected final String prefix;
    protected final int maxKeys;
diff --git a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/MutableObjectMetadataImpl.java b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/MutableObjectMetadataImpl.java
index 0407c33be8..451920cd2c 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/domain/internal/MutableObjectMetadataImpl.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/domain/internal/MutableObjectMetadataImpl.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.s3.domain.internal;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Date;
 import java.util.Map;
@@ -37,10 +36,7 @@ import com.google.common.collect.Maps;
  * 
  * @author Adrian Cole
  */
-public class MutableObjectMetadataImpl implements Serializable, MutableObjectMetadata {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4648755473986695062L;
+public class MutableObjectMetadataImpl implements MutableObjectMetadata {
 
    private String key;
    private String bucket;
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java
index 04081df106..d6cb541605 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQSApiMetadata.java
@@ -41,12 +41,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class SQSApiMetadata extends BaseRestApiMetadata {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -7077953935392202824L;
    
    public static final TypeToken<RestContext<SQSApi, SQSAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<SQSApi, SQSAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/CopyObjectException.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/CopyObjectException.java
index 276bc8ecf5..377c348c6a 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/CopyObjectException.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/CopyObjectException.java
@@ -53,7 +53,4 @@ public class CopyObjectException extends ResourceNotFoundException {
       return destinationPath;
    }
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2272965726680721281L;
-
 }
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
index 95cbf0fe60..c7eda20b90 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftApiMetadata.java
@@ -43,11 +43,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class SwiftApiMetadata extends BaseRestApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<SwiftClient, SwiftAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<SwiftClient, SwiftAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java
index f205b02298..a49703a4b6 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/SwiftKeystoneApiMetadata.java
@@ -45,11 +45,7 @@ import com.google.inject.Module;
  */
 public class SwiftKeystoneApiMetadata extends SwiftApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 820062881469203616L;
-
    public static final TypeToken<RestContext<SwiftKeystoneClient, SwiftKeystoneAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<SwiftKeystoneClient, SwiftKeystoneAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    private static Builder builder() {
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/DelegatingMutableObjectInfoWithMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/DelegatingMutableObjectInfoWithMetadata.java
index 0e7f72ddeb..8ca0c8e38c 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/DelegatingMutableObjectInfoWithMetadata.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/DelegatingMutableObjectInfoWithMetadata.java
@@ -33,8 +33,7 @@ import org.jclouds.openstack.swift.domain.ObjectInfo;
  */
 public class DelegatingMutableObjectInfoWithMetadata extends BaseMutableContentMetadata implements
          MutableObjectInfoWithMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 5280642704532078500L;
+
    private final MutableObjectInfoWithMetadata delegate;
 
    public DelegatingMutableObjectInfoWithMetadata(MutableObjectInfoWithMetadata delegate) {
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/TaskInErrorStateException.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/TaskInErrorStateException.java
index 94908a3c92..2c04f89015 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/TaskInErrorStateException.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/TaskInErrorStateException.java
@@ -27,8 +27,6 @@ import org.jclouds.vcloud.domain.Task;
  */
 public class TaskInErrorStateException extends RuntimeException {
 
-   private static final long serialVersionUID = 1L;
-
    private final Task task;
 
    public TaskInErrorStateException(Task task) {
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/TaskStillRunningException.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/TaskStillRunningException.java
index c0b47743bc..0859330288 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/TaskStillRunningException.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/TaskStillRunningException.java
@@ -27,8 +27,6 @@ import org.jclouds.vcloud.domain.Task;
  */
 public class TaskStillRunningException extends RuntimeException {
 
-   private static final long serialVersionUID = 1L;
-
    private final Task task;
 
    public TaskStillRunningException(Task task) {
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudApiMetadata.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudApiMetadata.java
index 1703debb8c..69d770b84d 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudApiMetadata.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudApiMetadata.java
@@ -47,12 +47,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class VCloudApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<VCloudClient, VCloudAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<VCloudClient, VCloudAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudResponseException.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudResponseException.java
index 4ce94e0c44..a56ed3563b 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudResponseException.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/VCloudResponseException.java
@@ -31,8 +31,6 @@ import org.jclouds.vcloud.domain.VCloudError;
  */
 public class VCloudResponseException extends HttpResponseException {
 
-   private static final long serialVersionUID = 1L;
-
    private org.jclouds.vcloud.domain.VCloudError error;
 
    public VCloudResponseException(HttpCommand command, HttpResponse response, VCloudError error) {
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java
index f71ee47cb8..68bd96ef4a 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/CatalogImpl.java
@@ -41,8 +41,6 @@ import com.google.common.collect.Lists;
  */
 public class CatalogImpl extends LinkedHashMap<String, ReferenceType> implements Catalog {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8464716396538298809L;
    private final String name;
    private final String type;
    private final URI href;
diff --git a/apis/walrus/src/main/java/org/jclouds/walrus/WalrusApiMetadata.java b/apis/walrus/src/main/java/org/jclouds/walrus/WalrusApiMetadata.java
index c2d4364949..84b25cfdbe 100644
--- a/apis/walrus/src/main/java/org/jclouds/walrus/WalrusApiMetadata.java
+++ b/apis/walrus/src/main/java/org/jclouds/walrus/WalrusApiMetadata.java
@@ -39,9 +39,7 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class WalrusApiMetadata extends S3ApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 820062881469203616L;
-   
+
    private static Builder builder() {
       return new Builder();
    }
diff --git a/archetypes/rest-client-archetype/src/main/resources/archetype-resources/src/main/java/__providerName__ApiMetadata.java b/archetypes/rest-client-archetype/src/main/resources/archetype-resources/src/main/java/__providerName__ApiMetadata.java
index 64942145a1..27f98e76c1 100644
--- a/archetypes/rest-client-archetype/src/main/resources/archetype-resources/src/main/java/__providerName__ApiMetadata.java
+++ b/archetypes/rest-client-archetype/src/main/resources/archetype-resources/src/main/java/__providerName__ApiMetadata.java
@@ -41,11 +41,7 @@ import com.google.inject.Module;
  */
 public class ${providerName}ApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
-
    public static final TypeToken<RestContext<${providerName}Api, ${providerName}AsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<${providerName}Api, ${providerName}AsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java b/blobstore/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java
index 1032f56546..a00117c871 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/ContainerNotFoundException.java
@@ -46,7 +46,4 @@ public class ContainerNotFoundException extends ResourceNotFoundException {
       return container;
    }
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2272965726680821281L;
-
 }
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/KeyAlreadyExistsException.java b/blobstore/src/main/java/org/jclouds/blobstore/KeyAlreadyExistsException.java
index c1f1d5d6c9..b98f3e0e86 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/KeyAlreadyExistsException.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/KeyAlreadyExistsException.java
@@ -50,7 +50,4 @@ public class KeyAlreadyExistsException extends RuntimeException {
       return key;
    }
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2272965726680821281L;
-
 }
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java b/blobstore/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java
index 70b66f5590..c7f691c243 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/KeyNotFoundException.java
@@ -52,7 +52,4 @@ public class KeyNotFoundException extends ResourceNotFoundException {
       return key;
    }
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2272965726680821281L;
-
 }
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java b/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java
index 08ae91972d..ae8c6e19da 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/TransientApiMetadata.java
@@ -30,9 +30,6 @@ import org.jclouds.blobstore.config.TransientBlobStoreContextModule;
  */
 public class TransientApiMetadata extends BaseApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -6541485071006878726L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
index 2bdac17019..c370762660 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
@@ -20,7 +20,6 @@ package org.jclouds.blobstore.domain.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Date;
 import java.util.Map;
@@ -36,9 +35,8 @@ import org.jclouds.javax.annotation.Nullable;
  * 
  * @author Adrian Cole
  */
-public class BlobMetadataImpl extends StorageMetadataImpl implements Serializable, BlobMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -5932618957134612231L;
+public class BlobMetadataImpl extends StorageMetadataImpl implements BlobMetadata {
+
    private final URI publicUri;
    private final String container;
    private final ContentMetadata contentMetadata;
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java
index a3201945aa..9a13181cf5 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java
@@ -33,8 +33,7 @@ import org.jclouds.io.payloads.BaseMutableContentMetadata;
  * @author Adrian Cole
  */
 public class MutableBlobMetadataImpl extends MutableStorageMetadataImpl implements MutableBlobMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -5932618957134612231L;
+
    private MutableContentMetadata contentMetadata;
    private URI publicUri;
    private String container;
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java
index 17d1a475d2..2f62a2d406 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.blobstore.domain.internal;
 
-import java.io.Serializable;
 import java.util.Date;
 
 import org.jclouds.blobstore.domain.MutableStorageMetadata;
@@ -32,10 +31,7 @@ import org.jclouds.domain.internal.MutableResourceMetadataImpl;
  * @author Adrian Cole
  */
 public class MutableStorageMetadataImpl extends MutableResourceMetadataImpl<StorageType> implements
-         MutableStorageMetadata, Serializable {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -280558162576368264L;
+         MutableStorageMetadata {
 
    private String eTag;
    private Date lastModified;
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/PageSetImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/PageSetImpl.java
index 245ab04020..02ce96f4f1 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/PageSetImpl.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/PageSetImpl.java
@@ -27,8 +27,6 @@ import com.google.common.collect.Iterables;
 
 public class PageSetImpl<T> extends LinkedHashSet<T> implements PageSet<T> {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -7133632087734650835L;
    protected final String marker;
 
    public PageSetImpl(Iterable<? extends T> contents, @Nullable String nextMarker) {
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java
index ee013270d0..7a33347876 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java
@@ -20,7 +20,6 @@ package org.jclouds.blobstore.domain.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Date;
 import java.util.Map;
@@ -36,10 +35,7 @@ import org.jclouds.javax.annotation.Nullable;
  * 
  * @author Adrian Cole
  */
-public class StorageMetadataImpl extends ResourceMetadataImpl<StorageType> implements StorageMetadata, Serializable {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -280558162576368264L;
+public class StorageMetadataImpl extends ResourceMetadataImpl<StorageType> implements StorageMetadata {
 
    @Nullable
    private final String eTag;
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/internal/BlobRuntimeException.java b/blobstore/src/main/java/org/jclouds/blobstore/internal/BlobRuntimeException.java
index 29fe079330..0f9c591883 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/internal/BlobRuntimeException.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/internal/BlobRuntimeException.java
@@ -19,7 +19,6 @@
 package org.jclouds.blobstore.internal;
 
 public class BlobRuntimeException extends RuntimeException {
-   private static final long serialVersionUID = 1L;
 
    public BlobRuntimeException(String s) {
       super(s);
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java b/blobstore/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java
index bc1bd98f41..dc6acbe933 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/util/BlobStoreUtils.java
@@ -20,14 +20,8 @@ package org.jclouds.blobstore.util;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -41,6 +35,7 @@ import org.jclouds.blobstore.domain.Blob;
 import org.jclouds.blobstore.domain.BlobMetadata;
 import org.jclouds.blobstore.domain.MutableBlobMetadata;
 import org.jclouds.blobstore.domain.StorageMetadata;
+import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl;
 import org.jclouds.blobstore.functions.BlobName;
 import org.jclouds.functions.ExceptionToValueOrPropagate;
 import org.jclouds.http.HttpRequest;
@@ -49,7 +44,6 @@ import org.jclouds.http.HttpUtils;
 import org.jclouds.rest.internal.GeneratedHttpRequest;
 import org.jclouds.util.Strings2;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import com.google.common.reflect.TypeToken;
 import com.google.common.util.concurrent.Futures;
@@ -169,21 +163,11 @@ public class BlobStoreUtils {
    public static Iterable<String> getSupportedProviders() {
       return org.jclouds.rest.Providers.getSupportedProvidersOfType(TypeToken.of(BlobStoreContext.class));
    }
-
+   
    public static MutableBlobMetadata copy(MutableBlobMetadata in) {
-      ByteArrayOutputStream bout = new ByteArrayOutputStream();
-      ObjectOutput os;
-      try {
-         os = new ObjectOutputStream(bout);
-         os.writeObject(in);
-         ObjectInput is = new ObjectInputStream(new ByteArrayInputStream(bout.toByteArray()));
-         MutableBlobMetadata metadata = (MutableBlobMetadata) is.readObject();
-         convertUserMetadataKeysToLowercase(metadata);
-         HttpUtils.copy(in.getContentMetadata(), metadata.getContentMetadata());
-         return metadata;
-      } catch (Exception e) {
-         throw Throwables.propagate(e);
-      }
+      MutableBlobMetadata metadata = new MutableBlobMetadataImpl(in);
+      convertUserMetadataKeysToLowercase(metadata);
+      return metadata;
    }
 
    public static MutableBlobMetadata copy(MutableBlobMetadata in, String newKey) {
diff --git a/common/aws/src/main/java/org/jclouds/aws/AWSResponseException.java b/common/aws/src/main/java/org/jclouds/aws/AWSResponseException.java
index 504cc2e2a2..123a1cb3e9 100644
--- a/common/aws/src/main/java/org/jclouds/aws/AWSResponseException.java
+++ b/common/aws/src/main/java/org/jclouds/aws/AWSResponseException.java
@@ -34,8 +34,6 @@ import org.jclouds.http.HttpResponseException;
  */
 public class AWSResponseException extends HttpResponseException {
 
-   private static final long serialVersionUID = 1L;
-
    private AWSError error = new AWSError();
 
    public AWSResponseException(HttpCommand command, HttpResponse response, AWSError error) {
diff --git a/common/azure/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java b/common/azure/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java
index ab1d8ac6d8..bc4604d2fc 100644
--- a/common/azure/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java
+++ b/common/azure/src/main/java/org/jclouds/azure/storage/AzureStorageResponseException.java
@@ -34,8 +34,6 @@ import org.jclouds.http.HttpResponseException;
  */
 public class AzureStorageResponseException extends HttpResponseException {
 
-   private static final long serialVersionUID = 1L;
-
    private AzureStorageError error = new AzureStorageError();
 
    public AzureStorageResponseException(HttpCommand command, HttpResponse response, AzureStorageError error) {
diff --git a/common/azure/src/main/java/org/jclouds/azure/storage/domain/internal/BoundedHashSet.java b/common/azure/src/main/java/org/jclouds/azure/storage/domain/internal/BoundedHashSet.java
index b81741e668..7dc00dc54f 100644
--- a/common/azure/src/main/java/org/jclouds/azure/storage/domain/internal/BoundedHashSet.java
+++ b/common/azure/src/main/java/org/jclouds/azure/storage/domain/internal/BoundedHashSet.java
@@ -32,8 +32,6 @@ import com.google.common.collect.Iterables;
  */
 public class BoundedHashSet<T> extends HashSet<T> implements BoundedSet<T> {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -7133632087734650835L;
    protected final URI url;
    protected final String prefix;
    protected final String marker;
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudResponseException.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudResponseException.java
index c4d7620d45..3967107eac 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudResponseException.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/VCloudResponseException.java
@@ -31,8 +31,6 @@ import org.jclouds.trmk.vcloud_0_8.domain.VCloudError;
  */
 public class VCloudResponseException extends HttpResponseException {
 
-   private static final long serialVersionUID = 1L;
-
    private org.jclouds.trmk.vcloud_0_8.domain.VCloudError error;
 
    public VCloudResponseException(HttpCommand command, HttpResponse response, VCloudError error) {
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java
index 5014428344..95265d48df 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/domain/internal/CatalogImpl.java
@@ -36,8 +36,6 @@ import org.jclouds.trmk.vcloud_0_8.domain.ReferenceType;
  */
 public class CatalogImpl extends LinkedHashMap<String, ReferenceType> implements Catalog {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8464716396538298809L;
    private final String name;
    private final String type;
    private final URI href;
diff --git a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudApiMetadata.java b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudApiMetadata.java
index 79a42826b0..853bd82204 100644
--- a/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudApiMetadata.java
+++ b/common/trmk/src/main/java/org/jclouds/trmk/vcloud_0_8/internal/TerremarkVCloudApiMetadata.java
@@ -24,9 +24,6 @@ import org.jclouds.rest.internal.BaseRestApiMetadata;
  */
 public abstract class TerremarkVCloudApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 866164758867358381L;
-
    protected TerremarkVCloudApiMetadata(Builder builder) {
       super(builder);
    }
diff --git a/compute/src/main/java/org/jclouds/compute/RunNodesException.java b/compute/src/main/java/org/jclouds/compute/RunNodesException.java
index d6e73d1074..d1433b952a 100644
--- a/compute/src/main/java/org/jclouds/compute/RunNodesException.java
+++ b/compute/src/main/java/org/jclouds/compute/RunNodesException.java
@@ -33,8 +33,6 @@ import org.jclouds.compute.domain.Template;
  */
 public class RunNodesException extends Exception {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2272965726680821281L;
    private final String group;
    private final int count;
    private final Template template;
diff --git a/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java b/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java
index ffbc8082be..2b19dd48e2 100644
--- a/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java
+++ b/compute/src/main/java/org/jclouds/compute/RunScriptOnNodesException.java
@@ -35,8 +35,6 @@ import org.jclouds.scriptbuilder.domain.Statement;
  */
 public class RunScriptOnNodesException extends Exception {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2272965726680821281L;
    private final Statement runScript;
    private final RunScriptOptions options;
    private final Map<NodeMetadata, ExecResponse> successfulNodes;
diff --git a/compute/src/main/java/org/jclouds/compute/callables/ScriptStillRunningException.java b/compute/src/main/java/org/jclouds/compute/callables/ScriptStillRunningException.java
index dbb5369552..8271c5d215 100644
--- a/compute/src/main/java/org/jclouds/compute/callables/ScriptStillRunningException.java
+++ b/compute/src/main/java/org/jclouds/compute/callables/ScriptStillRunningException.java
@@ -35,9 +35,6 @@ import com.google.common.util.concurrent.ListenableFuture;
  */
 public class ScriptStillRunningException extends TimeoutException implements Supplier<ListenableFuture<ExecResponse>> {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -7265376839848564663L;
-
    private final ListenableFuture<ExecResponse> delegate;
 
    public ScriptStillRunningException(long timeout, TimeUnit unit, ListenableFuture<ExecResponse> delegate) {
diff --git a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
index b4c29c5421..a4f3a46d07 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
@@ -22,7 +22,6 @@ import static com.google.common.base.Objects.equal;
 import static com.google.common.base.Objects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 
-import java.io.Serializable;
 import java.util.List;
 
 import org.jclouds.compute.options.TemplateOptions;
@@ -119,9 +118,7 @@ import com.google.common.collect.ImmutableMap;
  * @since 1.5
  */
 @Beta
-public class TemplateBuilderSpec implements Serializable {
-
-   private static final long serialVersionUID = -379469670373111569L;
+public class TemplateBuilderSpec {
 
    /** Parses a single value. */
    protected static interface ValueParser {
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
index 287adbf480..7564e62bfa 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
@@ -39,8 +39,7 @@ import com.google.common.collect.ImmutableSet;
  * @author Ivan Meredith
  */
 public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> implements ComputeMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7374704415964898694L;
+
    private final String id;
    private final ComputeType type;
    protected final Set<String> tags;
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
index f775f13198..33356cc19d 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
@@ -46,8 +46,6 @@ import com.google.common.collect.ImmutableList;
  */
 public class HardwareImpl extends ComputeMetadataImpl implements Hardware {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8994255275911717567L;
    private final List<Processor> processors;
    private final int ram;
    private final List<Volume> volumes;
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
index 7721f46f7a..9f8a3060a8 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
@@ -39,9 +39,6 @@ import com.google.common.base.Objects.ToStringHelper;
  */
 public class ImageImpl extends ComputeMetadataImpl implements Image {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7856744554191025307L;
-
    private final OperatingSystem operatingSystem;
    private final Status status;
    private final String backendStatus;
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
index c02bcbf3bc..58ff61e013 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
@@ -42,9 +42,6 @@ import com.google.common.collect.ImmutableSet;
  */
 public class NodeMetadataImpl extends ComputeMetadataImpl implements NodeMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7924307572338157887L;
-
    private final Status status;
    private final String backendStatus;
    private final int loginPort;
diff --git a/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java b/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java
index 5a6f2e553f..37b9085f6b 100644
--- a/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java
+++ b/compute/src/main/java/org/jclouds/compute/stub/StubApiMetadata.java
@@ -31,9 +31,6 @@ import org.jclouds.compute.stub.config.StubComputeServiceContextModule;
  */
 public class StubApiMetadata extends BaseApiMetadata {
    
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4880642520937391337L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/compute/src/main/java/org/jclouds/ssh/SshException.java b/compute/src/main/java/org/jclouds/ssh/SshException.java
index bff9b99eee..cf9cef7cb4 100644
--- a/compute/src/main/java/org/jclouds/ssh/SshException.java
+++ b/compute/src/main/java/org/jclouds/ssh/SshException.java
@@ -23,9 +23,6 @@ package org.jclouds.ssh;
  */
 public class SshException extends RuntimeException {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7271048517353750433L;
-
    public SshException() {
       super();
    }
diff --git a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
index e410b33588..e88c178d79 100644
--- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
+++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
@@ -26,7 +26,6 @@ import static org.easymock.EasyMock.reportMatcher;
 import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -390,9 +389,7 @@ public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTes
       return null;
    }
 
-   private static class PayloadEquals implements IArgumentMatcher, Serializable {
-
-      private static final long serialVersionUID = 583055160049982067L;
+   private static class PayloadEquals implements IArgumentMatcher {
 
       private final Object expected;
 
diff --git a/core/src/main/java/org/jclouds/apis/ApiMetadata.java b/core/src/main/java/org/jclouds/apis/ApiMetadata.java
index 562dd0e4f9..2884add8f6 100644
--- a/core/src/main/java/org/jclouds/apis/ApiMetadata.java
+++ b/core/src/main/java/org/jclouds/apis/ApiMetadata.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.apis;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Properties;
 import java.util.Set;
@@ -40,7 +39,7 @@ import com.google.inject.Module;
  * @since 1.5
  */
 @Beta
-public interface ApiMetadata extends Serializable {
+public interface ApiMetadata {
 
    public static interface Builder {
       /**
diff --git a/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java b/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
index 310965fc73..0412c6ebe7 100644
--- a/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
+++ b/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
@@ -58,9 +58,6 @@ import com.google.inject.Module;
  */
 public abstract class BaseApiMetadata implements ApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -8080028444066498110L;
-
    public static Properties defaultProperties() {
       Properties props = new Properties();
       // TODO: move this to ApiMetadata
@@ -268,8 +265,6 @@ public abstract class BaseApiMetadata implements ApiMetadata {
       @Override
       public ApiMetadata build() {
          return new BaseApiMetadata(this) {
-            /** The serialVersionUID */
-            private static final long serialVersionUID = 3599854558038790678L;
          };
       }
 
diff --git a/core/src/main/java/org/jclouds/collect/TransformingSetSupplier.java b/core/src/main/java/org/jclouds/collect/TransformingSetSupplier.java
index 693026bd50..e734b0b152 100644
--- a/core/src/main/java/org/jclouds/collect/TransformingSetSupplier.java
+++ b/core/src/main/java/org/jclouds/collect/TransformingSetSupplier.java
@@ -21,7 +21,6 @@ package org.jclouds.collect;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Predicates.notNull;
 
-import java.io.Serializable;
 import java.util.Set;
 
 import com.google.common.base.Function;
@@ -33,9 +32,7 @@ import com.google.common.collect.FluentIterable;
  * 
  * @author Adrian Cole
  */
-public class TransformingSetSupplier<F, T> implements Supplier<Set<? extends T>>, Serializable {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -8747953419394840218L;
+public class TransformingSetSupplier<F, T> implements Supplier<Set<? extends T>> {
    
    private final Supplier<Iterable<F>> backingSupplier;
    private final Function<F, T> converter;
diff --git a/core/src/main/java/org/jclouds/concurrent/DynamicThreadPoolExecutor.java b/core/src/main/java/org/jclouds/concurrent/DynamicThreadPoolExecutor.java
index 9fcfcf70f7..a2bc16e4ec 100644
--- a/core/src/main/java/org/jclouds/concurrent/DynamicThreadPoolExecutor.java
+++ b/core/src/main/java/org/jclouds/concurrent/DynamicThreadPoolExecutor.java
@@ -95,7 +95,6 @@ public class DynamicThreadPoolExecutor extends ThreadPoolExecutor {
 * @author kimchy (Shay Banon)
 */
     public static class DynamicQueue<E> extends LinkedBlockingQueue<E> {
-        private static final long serialVersionUID = 1L;
 
         /**
 * The executor this Queue belongs to
diff --git a/core/src/main/java/org/jclouds/concurrent/TransformParallelException.java b/core/src/main/java/org/jclouds/concurrent/TransformParallelException.java
index 60b2c39445..f7b902e668 100644
--- a/core/src/main/java/org/jclouds/concurrent/TransformParallelException.java
+++ b/core/src/main/java/org/jclouds/concurrent/TransformParallelException.java
@@ -31,9 +31,6 @@ import com.google.common.collect.Iterables;
  */
 public final class TransformParallelException extends RuntimeException {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-
    private final Map<?, Future<?>> success;
    private final Map<?, Exception> exceptions;
 
diff --git a/core/src/main/java/org/jclouds/domain/JsonBall.java b/core/src/main/java/org/jclouds/domain/JsonBall.java
index f415809db8..84e69602f1 100644
--- a/core/src/main/java/org/jclouds/domain/JsonBall.java
+++ b/core/src/main/java/org/jclouds/domain/JsonBall.java
@@ -29,9 +29,8 @@ import org.jclouds.util.Patterns;
  * @author Adrian Cole
  * @see <a href="http://code.google.com/p/google-gson/issues/detail?id=326"/>
  */
-public class JsonBall implements java.io.Serializable, Comparable<String>, CharSequence {
+public class JsonBall implements Comparable<String>, CharSequence {
 
-   private static final long serialVersionUID = -8168997021767065199L;
    private final String value;
 
    @Override
diff --git a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
index ed435f7799..22113da65d 100644
--- a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
@@ -21,7 +21,6 @@ package org.jclouds.domain.internal;
 import static com.google.common.base.Objects.equal;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
 
@@ -38,9 +37,7 @@ import com.google.common.collect.ImmutableSet;
  * 
  * @author Adrian Cole
  */
-public class LocationImpl implements Location, Serializable {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -280558162576368264L;
+public class LocationImpl implements Location {
 
    private final LocationScope scope;
    private final String id;
diff --git a/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java b/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
index 55f4bea69a..c6e069e1b4 100644
--- a/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.domain.internal;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Map;
 
@@ -33,11 +32,7 @@ import com.google.common.collect.Maps;
  * 
  * @author Adrian Cole
  */
-public class MutableResourceMetadataImpl<T extends Enum<T>> implements MutableResourceMetadata<T>,
-         Serializable {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -280558162576368264L;
+public class MutableResourceMetadataImpl<T extends Enum<T>> implements MutableResourceMetadata<T> {
 
    private T type;
    private String id;
diff --git a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
index 489eee3933..2816abfaf6 100644
--- a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
@@ -21,7 +21,6 @@ package org.jclouds.domain.internal;
 import static com.google.common.base.Objects.equal;
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Map;
 
@@ -38,10 +37,7 @@ import com.google.common.collect.Maps;
  * 
  * @author Adrian Cole
  */
-public abstract class ResourceMetadataImpl<T extends Enum<T>> implements ResourceMetadata<T>, Serializable {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -280558162576368264L;
+public abstract class ResourceMetadataImpl<T extends Enum<T>> implements ResourceMetadata<T> {
 
    @Nullable
    private final String providerId;
diff --git a/core/src/main/java/org/jclouds/http/HttpException.java b/core/src/main/java/org/jclouds/http/HttpException.java
index 733ee95b3d..02fd3b9025 100644
--- a/core/src/main/java/org/jclouds/http/HttpException.java
+++ b/core/src/main/java/org/jclouds/http/HttpException.java
@@ -25,8 +25,6 @@ package org.jclouds.http;
  */
 public class HttpException extends RuntimeException {
 
-    private static final long serialVersionUID = 1L;
-
     public HttpException(String s) {
 	super(s);
     }
diff --git a/core/src/main/java/org/jclouds/http/HttpResponseException.java b/core/src/main/java/org/jclouds/http/HttpResponseException.java
index dec772f7d6..519910fa08 100644
--- a/core/src/main/java/org/jclouds/http/HttpResponseException.java
+++ b/core/src/main/java/org/jclouds/http/HttpResponseException.java
@@ -32,7 +32,6 @@ import org.jclouds.util.Strings2;
  */
 public class HttpResponseException extends RuntimeException {
 
-   private static final long serialVersionUID = 1L;
    protected final HttpCommand command;
    protected final HttpResponse response;
    private String content;
diff --git a/core/src/main/java/org/jclouds/http/functions/ParseContentMD5FromHeaders.java b/core/src/main/java/org/jclouds/http/functions/ParseContentMD5FromHeaders.java
index f53d054951..c1447efa67 100644
--- a/core/src/main/java/org/jclouds/http/functions/ParseContentMD5FromHeaders.java
+++ b/core/src/main/java/org/jclouds/http/functions/ParseContentMD5FromHeaders.java
@@ -37,7 +37,6 @@ public class ParseContentMD5FromHeaders implements Function<HttpResponse, byte[]
 
    public static class NoContentMD5Exception extends RuntimeException {
 
-      private static final long serialVersionUID = 1L;
       private final HttpRequest request;
       private final HttpResponse response;
 
diff --git a/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java b/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java
index eee3531118..1e0d36487a 100644
--- a/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java
+++ b/core/src/main/java/org/jclouds/io/ContentMetadataBuilder.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.io;
 
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Date;
 
@@ -30,9 +29,7 @@ import com.google.common.base.Objects;
 /**
  * @author Adrian Cole
  */
-public class ContentMetadataBuilder implements Serializable {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -5279643002875371558L;
+public class ContentMetadataBuilder {
 
    public static ContentMetadataBuilder create() {
       return new ContentMetadataBuilder();
diff --git a/core/src/main/java/org/jclouds/io/payloads/BaseImmutableContentMetadata.java b/core/src/main/java/org/jclouds/io/payloads/BaseImmutableContentMetadata.java
index c5e06e3528..03c8d11c4b 100644
--- a/core/src/main/java/org/jclouds/io/payloads/BaseImmutableContentMetadata.java
+++ b/core/src/main/java/org/jclouds/io/payloads/BaseImmutableContentMetadata.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.io.payloads;
 
-import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Date;
 
@@ -30,10 +29,8 @@ import com.google.common.base.Objects;
 /**
  * @author Adrian Cole
  */
-public class BaseImmutableContentMetadata implements ContentMetadata, Serializable {
+public class BaseImmutableContentMetadata implements ContentMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -1445533440795766130L;
    protected String contentType;
    protected Long contentLength;
    protected byte[] contentMD5;
diff --git a/core/src/main/java/org/jclouds/io/payloads/BaseMutableContentMetadata.java b/core/src/main/java/org/jclouds/io/payloads/BaseMutableContentMetadata.java
index ef242446d6..0161eec5e8 100644
--- a/core/src/main/java/org/jclouds/io/payloads/BaseMutableContentMetadata.java
+++ b/core/src/main/java/org/jclouds/io/payloads/BaseMutableContentMetadata.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.io.payloads;
 
-import java.io.Serializable;
 import java.util.Date;
 
 import org.jclouds.io.ContentMetadata;
@@ -29,9 +28,7 @@ import org.jclouds.javax.annotation.Nullable;
 /**
  * @author Adrian Cole
  */
-public class BaseMutableContentMetadata extends ContentMetadataBuilder implements MutableContentMetadata, Serializable {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8364286391963469370L;
+public class BaseMutableContentMetadata extends ContentMetadataBuilder implements MutableContentMetadata {
 
    /**
     * {@inheritDoc}
diff --git a/core/src/main/java/org/jclouds/io/payloads/Part.java b/core/src/main/java/org/jclouds/io/payloads/Part.java
index 2634803cb5..80d1727237 100644
--- a/core/src/main/java/org/jclouds/io/payloads/Part.java
+++ b/core/src/main/java/org/jclouds/io/payloads/Part.java
@@ -42,9 +42,6 @@ public class Part extends DelegatingPayload {
 
    private static class PartMap extends LinkedHashMap<String, String> {
 
-      /** The serialVersionUID */
-      private static final long serialVersionUID = -287387556008320212L;
-
       static Part.PartMap create(String name) {
          Part.PartMap map = new PartMap();
          map.put("Content-Disposition", String.format("form-data; name=\"%s\"", checkNotNull(name,
diff --git a/core/src/main/java/org/jclouds/providers/AnonymousProviderMetadata.java b/core/src/main/java/org/jclouds/providers/AnonymousProviderMetadata.java
index 706345a49f..5bbdeeedd7 100644
--- a/core/src/main/java/org/jclouds/providers/AnonymousProviderMetadata.java
+++ b/core/src/main/java/org/jclouds/providers/AnonymousProviderMetadata.java
@@ -31,9 +31,6 @@ import org.jclouds.rest.AnonymousRestApiMetadata;
  */
 public class AnonymousProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 3038298137724260273L;
-
    public static ProviderMetadata forClientMappedToAsyncClientOnEndpoint(Class<?> client, Class<?> asyncClient,
             String endpoint) {
       return forApiWithEndpoint(AnonymousRestApiMetadata.forClientMappedToAsyncClient(client, asyncClient), endpoint);
diff --git a/core/src/main/java/org/jclouds/providers/ProviderMetadata.java b/core/src/main/java/org/jclouds/providers/ProviderMetadata.java
index aa8a708c46..8c3d8266d7 100644
--- a/core/src/main/java/org/jclouds/providers/ProviderMetadata.java
+++ b/core/src/main/java/org/jclouds/providers/ProviderMetadata.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.providers;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Properties;
 import java.util.Set;
@@ -34,7 +33,7 @@ import com.google.common.base.Optional;
  * 
  * @author Jeremy Whitlock <jwhitlock@apache.org>, Adrian Cole
  */
-public interface ProviderMetadata extends Serializable {
+public interface ProviderMetadata {
   
    /**
     * 
diff --git a/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java b/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
index 3ad8d84a3c..51a131d0a2 100644
--- a/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
+++ b/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
@@ -46,9 +46,6 @@ import com.google.common.collect.ImmutableSet;
  */
 public abstract class BaseProviderMetadata implements ProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -6647397371073751922L;
-
    @Override
    public ProviderMetadata.Builder toBuilder() {
       return new BaseProviderMetadata.Builder().fromProviderMetadata(this);
@@ -196,8 +193,6 @@ public abstract class BaseProviderMetadata implements ProviderMetadata {
       @Override
       public ProviderMetadata build() {
          return new BaseProviderMetadata(this) {
-            /** The serialVersionUID */
-            private static final long serialVersionUID = 562451792167711326L;
          };
       }
    }
diff --git a/core/src/main/java/org/jclouds/rest/AnonymousRestApiMetadata.java b/core/src/main/java/org/jclouds/rest/AnonymousRestApiMetadata.java
index 1baf6aea41..d02ba3d9f6 100644
--- a/core/src/main/java/org/jclouds/rest/AnonymousRestApiMetadata.java
+++ b/core/src/main/java/org/jclouds/rest/AnonymousRestApiMetadata.java
@@ -33,9 +33,6 @@ import com.google.common.annotations.Beta;
 @Beta
 public class AnonymousRestApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 5297549599879474202L;
-
    public static AnonymousRestApiMetadata forClientMappedToAsyncClient(Class<?> client, Class<?> asyncClient) {
       return new AnonymousRestApiMetadata(client, asyncClient);
    }
diff --git a/core/src/main/java/org/jclouds/rest/AuthorizationException.java b/core/src/main/java/org/jclouds/rest/AuthorizationException.java
index 411d02c6ab..e35b36a810 100644
--- a/core/src/main/java/org/jclouds/rest/AuthorizationException.java
+++ b/core/src/main/java/org/jclouds/rest/AuthorizationException.java
@@ -26,9 +26,6 @@ package org.jclouds.rest;
  */
 public class AuthorizationException extends RuntimeException {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2272965726680821281L;
-
    public AuthorizationException() {
       super();
    }
diff --git a/core/src/main/java/org/jclouds/rest/InsufficientResourcesException.java b/core/src/main/java/org/jclouds/rest/InsufficientResourcesException.java
index 5dd03c3da1..95c357470c 100644
--- a/core/src/main/java/org/jclouds/rest/InsufficientResourcesException.java
+++ b/core/src/main/java/org/jclouds/rest/InsufficientResourcesException.java
@@ -25,9 +25,6 @@ package org.jclouds.rest;
  */
 public class InsufficientResourcesException extends RuntimeException {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2272965726680821281L;
-
    public InsufficientResourcesException() {
       super();
    }
diff --git a/core/src/main/java/org/jclouds/rest/ResourceNotFoundException.java b/core/src/main/java/org/jclouds/rest/ResourceNotFoundException.java
index 4330849514..3d9741ba97 100644
--- a/core/src/main/java/org/jclouds/rest/ResourceNotFoundException.java
+++ b/core/src/main/java/org/jclouds/rest/ResourceNotFoundException.java
@@ -25,10 +25,6 @@ package org.jclouds.rest;
  */
 public class ResourceNotFoundException extends RuntimeException {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2272965726680821281L;
-   
-
    public ResourceNotFoundException() {
 		super();
 	}
diff --git a/core/src/main/java/org/jclouds/rest/binders/BindException.java b/core/src/main/java/org/jclouds/rest/binders/BindException.java
index 6e52cd205f..c55e30e98f 100644
--- a/core/src/main/java/org/jclouds/rest/binders/BindException.java
+++ b/core/src/main/java/org/jclouds/rest/binders/BindException.java
@@ -26,7 +26,6 @@ import org.jclouds.http.HttpRequest;
  * @author Ignasi Barrera
  */
 public class BindException extends RuntimeException {
-   private static final long serialVersionUID = 1L;
 
    private HttpRequest request;
 
diff --git a/core/src/main/java/org/jclouds/rest/config/RestClientModule.java b/core/src/main/java/org/jclouds/rest/config/RestClientModule.java
index a4b1b520a1..c15d44bc3a 100644
--- a/core/src/main/java/org/jclouds/rest/config/RestClientModule.java
+++ b/core/src/main/java/org/jclouds/rest/config/RestClientModule.java
@@ -42,10 +42,8 @@ public class RestClientModule<S, A> extends RestModule {
    protected RestClientModule(Map<Class<?>, Class<?>> sync2Async) {
       super(sync2Async);
       this.syncClientType = TypeTokens2.checkBound(new TypeToken<S>(getClass()) {
-         private static final long serialVersionUID = 7519656925453755752L;
       });
       this.asyncClientType = TypeTokens2.checkBound(new TypeToken<A>(getClass()) {
-         private static final long serialVersionUID = -4420015967358511548L;
       });
    }
 
diff --git a/core/src/main/java/org/jclouds/rest/internal/BaseRestApiMetadata.java b/core/src/main/java/org/jclouds/rest/internal/BaseRestApiMetadata.java
index 1aa9075783..f32ce7fe84 100644
--- a/core/src/main/java/org/jclouds/rest/internal/BaseRestApiMetadata.java
+++ b/core/src/main/java/org/jclouds/rest/internal/BaseRestApiMetadata.java
@@ -39,9 +39,7 @@ import com.google.common.reflect.TypeToken;
  */
 @Beta
 public class BaseRestApiMetadata extends BaseApiMetadata implements RestApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 564135477427872712L;
-   
+
    protected final Class<?> api;
    protected final Class<?> asyncApi;
 
@@ -69,7 +67,6 @@ public class BaseRestApiMetadata extends BaseApiMetadata implements RestApiMetad
    
    public static <S, A> TypeToken<RestContext<S, A>> contextToken(TypeToken<S> apiToken, TypeToken<A> asyncApiToken) {
       return new TypeToken<RestContext<S, A>>() {
-         private static final long serialVersionUID = 1L;
       }.where(new TypeParameter<S>() {
       }, apiToken).where(new TypeParameter<A>() {
       }, asyncApiToken);
diff --git a/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java b/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
index df0c78b2b4..69f4205122 100644
--- a/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
+++ b/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
@@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Throwables.propagate;
 import static org.jclouds.util.Throwables2.getFirstThrowableOfType;
 
-import java.io.Serializable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -57,22 +56,13 @@ import com.google.common.util.concurrent.UncheckedExecutionException;
  * @author Adrian Cole
  */
 public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> extends ForwardingObject implements
-         Supplier<T>, Serializable {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7626769175726919353L;
+         Supplier<T> {
 
    static class NullValueException extends RuntimeException {
 
-      /** The serialVersionUID */
-      private static final long serialVersionUID = 5064521423206078374L;
-
    }
 
-   static class SetAndThrowAuthorizationExceptionSupplierBackedLoader<V> extends CacheLoader<String, V> implements
-            Serializable {
-      /** The serialVersionUID */
-      private static final long serialVersionUID = -6129510622181946809L;
+   static class SetAndThrowAuthorizationExceptionSupplierBackedLoader<V> extends CacheLoader<String, V> {
 
       private final Supplier<V> delegate;
       private final AtomicReference<AuthorizationException> authException;
diff --git a/core/src/main/java/org/jclouds/util/Suppliers2.java b/core/src/main/java/org/jclouds/util/Suppliers2.java
index 21783e4e29..b136272aaa 100644
--- a/core/src/main/java/org/jclouds/util/Suppliers2.java
+++ b/core/src/main/java/org/jclouds/util/Suppliers2.java
@@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.Serializable;
 import java.util.Map;
 
 import com.google.common.annotations.Beta;
@@ -162,9 +161,7 @@ public class Suppliers2 {
       return new SupplierComposition<F, T>(function, supplier);
    }
 
-   private static class SupplierComposition<F, T> implements Supplier<T>, Serializable {
-      /** The serialVersionUID */
-      private static final long serialVersionUID = 1023509665531743802L;
+   private static class SupplierComposition<F, T> implements Supplier<T> {
 
       final Function<? super F, T> function;
       final Supplier<F> supplier;
diff --git a/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java b/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java
index deb0ec94a6..41381240d0 100644
--- a/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java
+++ b/core/src/test/java/org/jclouds/apis/JcloudsTestBlobStoreApiMetadata.java
@@ -31,9 +31,6 @@ import org.jclouds.rest.internal.BaseRestApiMetadata;
  */
 public class JcloudsTestBlobStoreApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -1178177610797635012L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java b/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java
index 8f3518d562..2c9fab9d11 100644
--- a/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java
+++ b/core/src/test/java/org/jclouds/apis/JcloudsTestComputeApiMetadata.java
@@ -31,9 +31,6 @@ import org.jclouds.rest.internal.BaseRestApiMetadata;
  */
 public class JcloudsTestComputeApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 4781483190708679197L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java b/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java
index 642420144a..0fc8dbde10 100644
--- a/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java
+++ b/core/src/test/java/org/jclouds/apis/JcloudsTestYetAnotherComputeApiMetadata.java
@@ -31,9 +31,6 @@ import org.jclouds.rest.internal.BaseRestApiMetadata;
  */
 public class JcloudsTestYetAnotherComputeApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 3142126601795295510L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/core/src/test/java/org/jclouds/config/BindRestContextWithWildcardExtendsExplicitAndRawTypeTest.java b/core/src/test/java/org/jclouds/config/BindRestContextWithWildcardExtendsExplicitAndRawTypeTest.java
index f47c6dcd6c..14b72a7002 100644
--- a/core/src/test/java/org/jclouds/config/BindRestContextWithWildcardExtendsExplicitAndRawTypeTest.java
+++ b/core/src/test/java/org/jclouds/config/BindRestContextWithWildcardExtendsExplicitAndRawTypeTest.java
@@ -116,7 +116,6 @@ public class BindRestContextWithWildcardExtendsExplicitAndRawTypeTest {
                IntegrationTestClient.class, IntegrationTestAsyncClient.class, "http://localhost");
 
       TypeToken wildCardExtendsType = new TypeToken<RestContext<? extends IntegrationTestClient, ? extends IntegrationTestAsyncClient>>() {
-         private static final long serialVersionUID = -8170268554700397860L;
       };
       
       md = md.toBuilder().apiMetadata(md.getApiMetadata().toBuilder().context(wildCardExtendsType).build()).build();
diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
index ef450c8133..149be6a380 100644
--- a/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
+++ b/core/src/test/java/org/jclouds/providers/JcloudsTestBlobStoreProviderMetadata.java
@@ -32,9 +32,6 @@ import com.google.common.collect.ImmutableSet;
  */
 public class JcloudsTestBlobStoreProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -3444555273226423853L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
index b9174a3ee2..f17a6e9794 100644
--- a/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
+++ b/core/src/test/java/org/jclouds/providers/JcloudsTestComputeProviderMetadata.java
@@ -31,9 +31,6 @@ import com.google.common.collect.ImmutableSet;
  * @author Jeremy Whitlock <jwhitlock@apache.org>
  */
 public class JcloudsTestComputeProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 424799830416415960L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java b/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java
index d316334aa6..30dae6119d 100644
--- a/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java
+++ b/core/src/test/java/org/jclouds/providers/JcloudsTestYetAnotherComputeProviderMetadata.java
@@ -32,9 +32,6 @@ import com.google.common.collect.ImmutableSet;
  */
 public class JcloudsTestYetAnotherComputeProviderMetadata extends BaseProviderMetadata {
    
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/core/src/test/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplierTest.java b/core/src/test/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplierTest.java
index 9687811ab1..faa32f8a39 100644
--- a/core/src/test/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplierTest.java
+++ b/core/src/test/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplierTest.java
@@ -27,7 +27,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.Serializable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -112,7 +111,6 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplierTest {
       final long EXPIRATION_TIME = 200;
 
       Supplier<Integer> slowSupplier = new CountingSupplier() {
-         private static final long serialVersionUID = 1L;
 
          @Override
          public Integer get() {
@@ -139,8 +137,7 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplierTest {
    // It should be deleted when we can switch back to using the google
    // Supplier.memoizeWithExpiration.
 
-   private static class CountingSupplier implements Supplier<Integer>, Serializable {
-      private static final long serialVersionUID = 0L;
+   private static class CountingSupplier implements Supplier<Integer> {
       transient int calls = 0;
 
       @Override
@@ -160,23 +157,6 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplierTest {
       checkExpiration(countingSupplier, memoizedSupplier);
    }
 
-   @Test
-   public void testMemoizeWithExpirationSerialized() throws InterruptedException {
-      CountingSupplier countingSupplier = new CountingSupplier();
-
-      Supplier<Integer> memoizedSupplier = new MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier(
-               new AtomicReference<AuthorizationException>(), countingSupplier, 75, TimeUnit.MILLISECONDS);
-      // Calls to the original memoized supplier shouldn't affect its copy.
-      memoizedSupplier.get();
-
-      Supplier<Integer> copy = reserialize(memoizedSupplier);
-      memoizedSupplier.get();
-
-      CountingSupplier countingCopy = (CountingSupplier) ((MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier) copy)
-               .delegate();
-      checkExpiration(countingCopy, copy);
-   }
-
    private void checkExpiration(CountingSupplier countingSupplier, Supplier<Integer> memoizedSupplier)
             throws InterruptedException {
       // the underlying supplier hasn't executed yet
@@ -283,19 +263,4 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplierTest {
       assertEquals(1, count.get());
    }
 
-   // Taken from com.google.common.testing.SerializableTester
-   private static <T> T reserialize(T object) {
-      checkNotNull(object);
-      ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-      try {
-         ObjectOutputStream out = new ObjectOutputStream(bytes);
-         out.writeObject(object);
-         ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()));
-         return (T) in.readObject();
-      } catch (IOException e) {
-         throw new RuntimeException(e);
-      } catch (ClassNotFoundException e) {
-         throw new RuntimeException(e);
-      }
-   }
 }
diff --git a/core/src/test/java/org/jclouds/util/Throwables2Test.java b/core/src/test/java/org/jclouds/util/Throwables2Test.java
index 68cfc3f117..278fe874c1 100644
--- a/core/src/test/java/org/jclouds/util/Throwables2Test.java
+++ b/core/src/test/java/org/jclouds/util/Throwables2Test.java
@@ -264,11 +264,6 @@ public class Throwables2Test {
 
    static class TestException extends Exception {
 
-      /**
-       * 
-       */
-      private static final long serialVersionUID = 1L;
-
    }
 
 }
diff --git a/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllResourcesController.java b/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllResourcesController.java
index 21f5b28605..4b238ce6b9 100644
--- a/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllResourcesController.java
+++ b/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllResourcesController.java
@@ -61,7 +61,6 @@ import com.google.common.util.concurrent.ListeningExecutorService;
  */
 @Singleton
 public class GetAllResourcesController extends HttpServlet {
-   private static final long serialVersionUID = 1L;
 
    private final ListeningExecutorService currentRequestExecutorService;
    private final Iterable<View> views;
diff --git a/drivers/jsch/src/test/java/org/jclouds/ssh/jsch/JschSshClientTest.java b/drivers/jsch/src/test/java/org/jclouds/ssh/jsch/JschSshClientTest.java
index 4d8d14b4ca..d114b4bab4 100644
--- a/drivers/jsch/src/test/java/org/jclouds/ssh/jsch/JschSshClientTest.java
+++ b/drivers/jsch/src/test/java/org/jclouds/ssh/jsch/JschSshClientTest.java
@@ -137,7 +137,6 @@ public class JschSshClientTest {
    }
 
    private static class ExceptionWithStrangeToString extends RuntimeException {
-      private static final long serialVersionUID = 1L;
       private static final String MESSAGE = "foo-bar-exception-tostring";
       public String toString() { return MESSAGE; }
    }
diff --git a/drivers/sshj/src/test/java/org/jclouds/sshj/SshjSshClientTest.java b/drivers/sshj/src/test/java/org/jclouds/sshj/SshjSshClientTest.java
index a3946527b9..6c3afafa22 100644
--- a/drivers/sshj/src/test/java/org/jclouds/sshj/SshjSshClientTest.java
+++ b/drivers/sshj/src/test/java/org/jclouds/sshj/SshjSshClientTest.java
@@ -149,7 +149,6 @@ public class SshjSshClientTest {
    }
 
    private static class ExceptionWithStrangeToString extends RuntimeException {
-      private static final long serialVersionUID = 1L;
       private static final String MESSAGE = "foo-bar-exception-tostring";
 
       public String toString() {
diff --git a/labs/abiquo/src/main/java/org/jclouds/abiquo/AbiquoApiMetadata.java b/labs/abiquo/src/main/java/org/jclouds/abiquo/AbiquoApiMetadata.java
index d3d5c78b61..e83fe9f134 100644
--- a/labs/abiquo/src/main/java/org/jclouds/abiquo/AbiquoApiMetadata.java
+++ b/labs/abiquo/src/main/java/org/jclouds/abiquo/AbiquoApiMetadata.java
@@ -44,12 +44,9 @@ import com.google.inject.Module;
  * @author Ignasi Barrera
  */
 public class AbiquoApiMetadata extends BaseRestApiMetadata {
-   /** Serial UID. */
-   private static final long serialVersionUID = -8355533493674898171L;
 
    /** The token describing the rest api context. */
    public static final TypeToken<RestContext<AbiquoApi, AbiquoAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<AbiquoApi, AbiquoAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    public AbiquoApiMetadata() {
diff --git a/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/AbiquoException.java b/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/AbiquoException.java
index 8b2831b7bf..85db8d6abc 100644
--- a/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/AbiquoException.java
+++ b/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/AbiquoException.java
@@ -39,8 +39,6 @@ import com.google.common.collect.Lists;
  * @author Ignasi Barrera
  */
 public class AbiquoException extends RuntimeException {
-   /** Serial UID. */
-   private static final long serialVersionUID = 1L;
 
    /** The HTTP status. */
    private Status httpStatus;
diff --git a/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/BuilderException.java b/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/BuilderException.java
index 3fea01a0d3..66ce6387f9 100644
--- a/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/BuilderException.java
+++ b/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/BuilderException.java
@@ -25,7 +25,6 @@ package org.jclouds.abiquo.domain.exception;
  * @author Ignasi Barrera
  */
 public class BuilderException extends RuntimeException {
-   private static final long serialVersionUID = 1L;
 
    /**
     * Creates a {@link BuilderException} with the given message.
diff --git a/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/WrapperException.java b/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/WrapperException.java
index 911db94e8b..191b0c0cc8 100644
--- a/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/WrapperException.java
+++ b/labs/abiquo/src/main/java/org/jclouds/abiquo/domain/exception/WrapperException.java
@@ -29,7 +29,6 @@ import com.abiquo.model.transport.SingleResourceTransportDto;
  * @author Ignasi Barrera
  */
 public class WrapperException extends RuntimeException {
-   private static final long serialVersionUID = 1L;
 
    private Class<? extends DomainWrapper<?>> wrapperClass;
 
diff --git a/labs/abiquo/src/test/java/org/jclouds/abiquo/binders/BindToPathTest.java b/labs/abiquo/src/test/java/org/jclouds/abiquo/binders/BindToPathTest.java
index e1e5ba36ac..0e9c10534a 100644
--- a/labs/abiquo/src/test/java/org/jclouds/abiquo/binders/BindToPathTest.java
+++ b/labs/abiquo/src/test/java/org/jclouds/abiquo/binders/BindToPathTest.java
@@ -151,7 +151,6 @@ public class BindToPathTest {
    }
 
    static class TestDto extends SingleResourceTransportDto {
-      private static final long serialVersionUID = 1L;
 
       public TestDto() {
          addLink(new RESTLink("edit", "http://linkuri"));
diff --git a/labs/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java b/labs/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java
index 3143a4cf1d..3e04029f28 100644
--- a/labs/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java
+++ b/labs/aws-elb/src/main/java/org/jclouds/aws/elb/AWSELBProviderMetadata.java
@@ -44,9 +44,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Adrian Cole
  */
 public class AWSELBProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7750012233546655021L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/labs/aws-iam/src/main/java/org/jclouds/aws/iam/AWSIAMProviderMetadata.java b/labs/aws-iam/src/main/java/org/jclouds/aws/iam/AWSIAMProviderMetadata.java
index 43dd6a516a..03fa0dcc8c 100644
--- a/labs/aws-iam/src/main/java/org/jclouds/aws/iam/AWSIAMProviderMetadata.java
+++ b/labs/aws-iam/src/main/java/org/jclouds/aws/iam/AWSIAMProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
 * @author Adrian Cole
 */
 public class AWSIAMProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 2394954723306943404L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/labs/aws-rds/src/main/java/org/jclouds/aws/rds/AWSRDSProviderMetadata.java b/labs/aws-rds/src/main/java/org/jclouds/aws/rds/AWSRDSProviderMetadata.java
index 84f86d534a..49ed90f76c 100644
--- a/labs/aws-rds/src/main/java/org/jclouds/aws/rds/AWSRDSProviderMetadata.java
+++ b/labs/aws-rds/src/main/java/org/jclouds/aws/rds/AWSRDSProviderMetadata.java
@@ -44,9 +44,6 @@ import org.jclouds.rds.RDSApiMetadata;
  * @author Adrian Cole
  */
 public class AWSRDSProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7750012233546655021L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/labs/azure-management/src/main/java/org/jclouds/azure/management/AzureManagementApiMetadata.java b/labs/azure-management/src/main/java/org/jclouds/azure/management/AzureManagementApiMetadata.java
index 5860340562..193e4f55f6 100644
--- a/labs/azure-management/src/main/java/org/jclouds/azure/management/AzureManagementApiMetadata.java
+++ b/labs/azure-management/src/main/java/org/jclouds/azure/management/AzureManagementApiMetadata.java
@@ -40,11 +40,8 @@ import com.google.inject.Module;
  * @author Gerald Pereira
  */
 public class AzureManagementApiMetadata extends BaseRestApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8067252472547486854L;
 
    public static final TypeToken<RestContext<AzureManagementApi, AzureManagementAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<AzureManagementApi, AzureManagementAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    private static Builder builder() {
diff --git a/labs/azure-management/src/main/java/org/jclouds/azure/management/AzureManagementProviderMetadata.java b/labs/azure-management/src/main/java/org/jclouds/azure/management/AzureManagementProviderMetadata.java
index b52a63e2f3..4462aafa04 100644
--- a/labs/azure-management/src/main/java/org/jclouds/azure/management/AzureManagementProviderMetadata.java
+++ b/labs/azure-management/src/main/java/org/jclouds/azure/management/AzureManagementProviderMetadata.java
@@ -34,9 +34,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class AzureManagementProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8271570736207734777L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApiMetadata.java b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApiMetadata.java
index dd8ee87fd9..714e13b92d 100644
--- a/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApiMetadata.java
+++ b/labs/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/CDMIApiMetadata.java
@@ -37,11 +37,7 @@ import com.google.inject.Module;
  */
 public class CDMIApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
-
    public static final TypeToken<RestContext<CDMIApi, CDMIAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<CDMIApi, CDMIAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/labs/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadata.java b/labs/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadata.java
index da17e6c0e7..a7242ff07e 100644
--- a/labs/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadata.java
+++ b/labs/cloudstack-ec2/src/main/java/org/jclouds/cloudstack/ec2/CloudStackEC2ApiMetadata.java
@@ -39,11 +39,7 @@ import com.google.inject.Module;
  */
 public class CloudStackEC2ApiMetadata extends EC2ApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -8539835226183747429L;
-
    public static final TypeToken<RestContext<CloudStackEC2Client, CloudStackEC2AsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<CloudStackEC2Client, CloudStackEC2AsyncClient>>() {
-      private static final long serialVersionUID = -6449920293625658712L;
    };
 
    private static Builder builder() {
diff --git a/labs/elb/src/main/java/org/jclouds/elb/ELBApiMetadata.java b/labs/elb/src/main/java/org/jclouds/elb/ELBApiMetadata.java
index e1ee3725bd..766339e44f 100644
--- a/labs/elb/src/main/java/org/jclouds/elb/ELBApiMetadata.java
+++ b/labs/elb/src/main/java/org/jclouds/elb/ELBApiMetadata.java
@@ -41,12 +41,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class ELBApiMetadata extends BaseRestApiMetadata {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -7077953935392202824L;
    
    public static final TypeToken<RestContext<ELBApi, ELBAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<ELBApi, ELBAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/labs/fgcp-au/src/main/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderMetadata.java b/labs/fgcp-au/src/main/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderMetadata.java
index c4c4496288..54ca5805c4 100644
--- a/labs/fgcp-au/src/main/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderMetadata.java
+++ b/labs/fgcp-au/src/main/java/org/jclouds/fujitsu/fgcp/FGCPAUProviderMetadata.java
@@ -30,9 +30,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class FGCPAUProviderMetadata extends FGCPProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1735901960026547803L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/labs/fgcp-de/src/main/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderMetadata.java b/labs/fgcp-de/src/main/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderMetadata.java
index 5f47f4c278..d1a056b02d 100644
--- a/labs/fgcp-de/src/main/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderMetadata.java
+++ b/labs/fgcp-de/src/main/java/org/jclouds/fujitsu/fgcp/FGCPDEProviderMetadata.java
@@ -30,8 +30,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class FGCPDEProviderMetadata extends FGCPProviderMetadata {
 
-   private static final long serialVersionUID = -8498457904032259345L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApiMetadata.java b/labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApiMetadata.java
index c187b7edee..770bd9fe62 100644
--- a/labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApiMetadata.java
+++ b/labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPApiMetadata.java
@@ -40,9 +40,6 @@ import com.google.inject.Module;
  */
 public class FGCPApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -8430912756058292588L;
-
    @Override
    public Builder toBuilder() {
       return new Builder().fromApiMetadata(this);
diff --git a/labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPProviderMetadata.java b/labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPProviderMetadata.java
index a97fae4bc8..5a1025ec6a 100644
--- a/labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPProviderMetadata.java
+++ b/labs/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPProviderMetadata.java
@@ -32,8 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class FGCPProviderMetadata extends BaseProviderMetadata {
 
-   private static final long serialVersionUID = 7527265705102650456L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/labs/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderMetadata.java b/labs/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderMetadata.java
index 9f6965e047..8cc5ae637c 100644
--- a/labs/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderMetadata.java
+++ b/labs/greenqloud-compute/src/main/java/org/jclouds/greenqloud/compute/GreenQloudComputeProviderMetadata.java
@@ -41,9 +41,6 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class GreenQloudComputeProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7625722444851538962L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/labs/greenqloud-storage/src/main/java/org/jclouds/greenqloud/storage/GreenQloudStorageProviderMetadata.java b/labs/greenqloud-storage/src/main/java/org/jclouds/greenqloud/storage/GreenQloudStorageProviderMetadata.java
index 503209e166..511d2b3adb 100644
--- a/labs/greenqloud-storage/src/main/java/org/jclouds/greenqloud/storage/GreenQloudStorageProviderMetadata.java
+++ b/labs/greenqloud-storage/src/main/java/org/jclouds/greenqloud/storage/GreenQloudStorageProviderMetadata.java
@@ -36,9 +36,6 @@ import org.jclouds.s3.S3ApiMetadata;
  * @author Adrian Cole
  */
 public class GreenQloudStorageProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/labs/iam/src/main/java/org/jclouds/iam/IAMApiMetadata.java b/labs/iam/src/main/java/org/jclouds/iam/IAMApiMetadata.java
index 0ebac547c8..cdd6fcdfb7 100644
--- a/labs/iam/src/main/java/org/jclouds/iam/IAMApiMetadata.java
+++ b/labs/iam/src/main/java/org/jclouds/iam/IAMApiMetadata.java
@@ -38,11 +38,7 @@ import com.google.common.reflect.TypeToken;
  */
 public class IAMApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 3450830053589179249L;
-
    public static final TypeToken<RestContext<? extends IAMApi, ? extends IAMAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<? extends IAMApi, ? extends IAMAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/labs/jenkins/src/main/java/org/jclouds/jenkins/v1/JenkinsApiMetadata.java b/labs/jenkins/src/main/java/org/jclouds/jenkins/v1/JenkinsApiMetadata.java
index 8e6f0defc5..00a8c26b48 100644
--- a/labs/jenkins/src/main/java/org/jclouds/jenkins/v1/JenkinsApiMetadata.java
+++ b/labs/jenkins/src/main/java/org/jclouds/jenkins/v1/JenkinsApiMetadata.java
@@ -38,12 +38,8 @@ import com.google.inject.Module;
 public class JenkinsApiMetadata extends BaseRestApiMetadata {
    
    public static final String ANONYMOUS_IDENTITY = "ANONYMOUS";
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<JenkinsApi, JenkinsAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<JenkinsApi, JenkinsAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/JoyentCloudApiMetadata.java b/labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/JoyentCloudApiMetadata.java
index 67a05dff80..a51fed6cf4 100644
--- a/labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/JoyentCloudApiMetadata.java
+++ b/labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/JoyentCloudApiMetadata.java
@@ -41,11 +41,7 @@ import com.google.inject.Module;
  */
 public class JoyentCloudApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
-
    public static final TypeToken<RestContext<JoyentCloudApi, JoyentCloudAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<JoyentCloudApi, JoyentCloudAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/reference/Metadata.java b/labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/reference/Metadata.java
index c4fff8059c..fd61e2b391 100644
--- a/labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/reference/Metadata.java
+++ b/labs/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/reference/Metadata.java
@@ -44,7 +44,6 @@ public enum Metadata {
     * </pre>
     */
    CREDENTIALS(new TypeToken<Map<String, String>>() {
-      private static final long serialVersionUID = -433136967305618708L;
    }.getType());
 
    private final Type valueType;
diff --git a/labs/joyentcloud/src/main/java/org/jclouds/joyent/joyentcloud/JoyentCloudProviderMetadata.java b/labs/joyentcloud/src/main/java/org/jclouds/joyent/joyentcloud/JoyentCloudProviderMetadata.java
index 5be7e41054..4be1332e0d 100644
--- a/labs/joyentcloud/src/main/java/org/jclouds/joyent/joyentcloud/JoyentCloudProviderMetadata.java
+++ b/labs/joyentcloud/src/main/java/org/jclouds/joyent/joyentcloud/JoyentCloudProviderMetadata.java
@@ -35,9 +35,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class JoyentCloudProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 2196535609684739834L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/labs/nodepool/src/main/java/org/jclouds/nodepool/NodePoolApiMetadata.java b/labs/nodepool/src/main/java/org/jclouds/nodepool/NodePoolApiMetadata.java
index 98b53571fb..0ca65054d8 100644
--- a/labs/nodepool/src/main/java/org/jclouds/nodepool/NodePoolApiMetadata.java
+++ b/labs/nodepool/src/main/java/org/jclouds/nodepool/NodePoolApiMetadata.java
@@ -41,9 +41,6 @@ import com.google.inject.Module;
 
 public class NodePoolApiMetadata extends BaseApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2778027403592717115L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java b/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
index 9086048425..01b059edbe 100644
--- a/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
+++ b/labs/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
@@ -43,12 +43,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class GlanceApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<GlanceApi, GlanceAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<GlanceApi, GlanceAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java b/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java
index 9e986d7028..45a0725f3c 100644
--- a/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java
+++ b/labs/openstack-quantum/src/main/java/org/jclouds/openstack/quantum/v1_0/QuantumApiMetadata.java
@@ -43,11 +43,8 @@ import com.google.inject.Module;
  * @author Adam Lowe
  */
 public class QuantumApiMetadata extends BaseRestApiMetadata {
-      /** The serialVersionUID */
-   private static final long serialVersionUID = -7273686435105663195L;
 
    public static final TypeToken<RestContext<QuantumApi, QuantumAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<QuantumApi, QuantumAsyncApi>>() {
-      private static final long serialVersionUID = -3493117927790861884L;
    };
 
    @Override
diff --git a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java b/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
index 440937b09e..59e8e87618 100644
--- a/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
+++ b/labs/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
@@ -43,12 +43,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class SwiftApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<SwiftApi, SwiftAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<SwiftApi, SwiftAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersApiMetadata.java b/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersApiMetadata.java
index 29fb61f349..5cd3e989a5 100644
--- a/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersApiMetadata.java
+++ b/labs/opsource-servers/src/main/java/org/jclouds/opsource/servers/OpSourceServersApiMetadata.java
@@ -34,12 +34,10 @@ import com.google.common.reflect.TypeToken;
  * @author Adrian Cole
  */
 public class OpSourceServersApiMetadata extends BaseRestApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
-
+   
    public static final TypeToken<RestContext<OpSourceServersApi, OpSourceServersAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<OpSourceServersApi, OpSourceServersAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
+
    @Override
    public Builder toBuilder() {
       return new Builder().fromApiMetadata(this);
diff --git a/labs/rds/src/main/java/org/jclouds/rds/RDSApiMetadata.java b/labs/rds/src/main/java/org/jclouds/rds/RDSApiMetadata.java
index 90c4d7266d..f53bf44475 100644
--- a/labs/rds/src/main/java/org/jclouds/rds/RDSApiMetadata.java
+++ b/labs/rds/src/main/java/org/jclouds/rds/RDSApiMetadata.java
@@ -39,12 +39,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class RDSApiMetadata extends BaseRestApiMetadata {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -7077953935392202824L;
    
    public static final TypeToken<RestContext<RDSApi, RDSAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<RDSApi, RDSAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    @Override
diff --git a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCApiMetadata.java b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCApiMetadata.java
index 1ebdede609..cb67b314ee 100644
--- a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCApiMetadata.java
+++ b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCApiMetadata.java
@@ -40,12 +40,8 @@ import com.google.inject.Module;
  * @author Kedar Dave
  */
 public class VPDCApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<VPDCApi, VPDCAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<VPDCApi, VPDCAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCProviderMetadata.java b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCProviderMetadata.java
index 8f41b933f1..2c9c1dd51f 100644
--- a/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCProviderMetadata.java
+++ b/labs/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/VPDCProviderMetadata.java
@@ -33,9 +33,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class VPDCProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -3438042651384066520L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/labs/smartos-ssh/src/main/java/org/jclouds/smartos/SmartOSApiMetadata.java b/labs/smartos-ssh/src/main/java/org/jclouds/smartos/SmartOSApiMetadata.java
index 5218e6b32f..ef88f9d530 100644
--- a/labs/smartos-ssh/src/main/java/org/jclouds/smartos/SmartOSApiMetadata.java
+++ b/labs/smartos-ssh/src/main/java/org/jclouds/smartos/SmartOSApiMetadata.java
@@ -17,9 +17,6 @@ import com.google.inject.Module;
  */
 public class SmartOSApiMetadata extends BaseApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 3606170564482119304L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/labs/smartos-ssh/src/main/java/org/jclouds/smartos/SmartOSHostController.java b/labs/smartos-ssh/src/main/java/org/jclouds/smartos/SmartOSHostController.java
index 30cff223cd..d0b723af73 100644
--- a/labs/smartos-ssh/src/main/java/org/jclouds/smartos/SmartOSHostController.java
+++ b/labs/smartos-ssh/src/main/java/org/jclouds/smartos/SmartOSHostController.java
@@ -42,7 +42,6 @@ public class SmartOSHostController {
    protected transient SshClient _connection;
 
    public static class HostException extends RuntimeException {
-      private static final long serialVersionUID = -2247796213703641847L;
 
       public HostException(String s, Throwable throwable) {
          super(s, throwable);
@@ -54,7 +53,6 @@ public class SmartOSHostController {
    }
 
    public static class NoResponseException extends Exception {
-      private static final long serialVersionUID = -2247796213703641847L;
 
       public NoResponseException() {
       }
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadata.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadata.java
index 77c10b6aaf..d0a256fa62 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadata.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorApiMetadata.java
@@ -42,9 +42,6 @@ import com.google.common.reflect.TypeToken;
  */
 public class VCloudDirectorApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
-
    public static final TypeToken<VCloudDirectorContext> CONTEXT_TOKEN = TypeToken.of(VCloudDirectorContext.class);
    
    @Override
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorConstants.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorConstants.java
index 22ff8fcc7a..a1bf2e9a30 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorConstants.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorConstants.java
@@ -73,7 +73,5 @@ public class VCloudDirectorConstants {
    /** TODO javadoc */
    public static final TypeToken<RestContext<SessionApi, SessionAsyncApi>> SESSION_CONTEXT_TYPE =
          new TypeToken<RestContext<SessionApi, SessionAsyncApi>>() {
-				/** The serialVersionUID */
-				private static final long serialVersionUID = -3625362618882122604L;
 		   };
 }
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorException.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorException.java
index b6aa1e1c3b..aff812a61c 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorException.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorException.java
@@ -32,9 +32,6 @@ import com.google.common.collect.Iterables;
  */
 public class VCloudDirectorException extends RuntimeException {
 
-   /** The serialVersionUID. */
-   private static final long serialVersionUID = -5292516858598372960L;
-
    private static final String MSG_FMT = "%s (%d) %s: %s";   
 
    private final Error error;
diff --git a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/VirtualBoxApiMetadata.java b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/VirtualBoxApiMetadata.java
index 29be851f99..662eadb6f5 100644
--- a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/VirtualBoxApiMetadata.java
+++ b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/VirtualBoxApiMetadata.java
@@ -47,9 +47,6 @@ import com.google.inject.Module;
  */
 public class VirtualBoxApiMetadata extends BaseApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -7039233043408808289L;
-
    @Override
    public Builder toBuilder() {
       return new Builder().fromApiMetadata(this);
diff --git a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineNameOrIdAndNicSlot.java b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineNameOrIdAndNicSlot.java
index 360f08350b..99fd1c5304 100644
--- a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineNameOrIdAndNicSlot.java
+++ b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineNameOrIdAndNicSlot.java
@@ -4,7 +4,6 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 
-import java.io.Serializable;
 
 import com.google.common.base.Objects;
 import com.google.common.base.Splitter;
@@ -24,7 +23,7 @@ import com.google.common.collect.Iterables;
  *
  * @author Andrea Turli
  */
-public final class MachineNameOrIdAndNicSlot implements Serializable {
+public final class MachineNameOrIdAndNicSlot {
 
   private static final String SEPARATOR = ":";
 
@@ -127,6 +126,4 @@ public final class MachineNameOrIdAndNicSlot implements Serializable {
   private static boolean isValidSlot(long slot) {
     return slot >= 0l && slot <= 3l;
   }
-
-  private static final long serialVersionUID = 0;
 }
diff --git a/loadbalancer/src/main/java/org/jclouds/loadbalancer/domain/internal/LoadBalancerMetadataImpl.java b/loadbalancer/src/main/java/org/jclouds/loadbalancer/domain/internal/LoadBalancerMetadataImpl.java
index e427eadbb1..f8e7c947ac 100644
--- a/loadbalancer/src/main/java/org/jclouds/loadbalancer/domain/internal/LoadBalancerMetadataImpl.java
+++ b/loadbalancer/src/main/java/org/jclouds/loadbalancer/domain/internal/LoadBalancerMetadataImpl.java
@@ -35,8 +35,7 @@ import com.google.common.collect.ImmutableSet;
  * @author Adrian Cole
  */
 public class LoadBalancerMetadataImpl extends ResourceMetadataImpl<LoadBalancerType> implements LoadBalancerMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7374704415964898694L;
+
    private final String id;
    private final LoadBalancerType type;
    private final Set<String> addresses;
diff --git a/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java b/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java
index ab0d7f85d8..678f8a473d 100644
--- a/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java
+++ b/providers/aws-cloudwatch/src/main/java/org/jclouds/aws/cloudwatch/AWSCloudWatchProviderMetadata.java
@@ -35,9 +35,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
 * @author Adrian Cole
 */
 public class AWSCloudWatchProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 2394954723306943404L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ApiMetadata.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ApiMetadata.java
index f7c15bcf6b..a2451cb0c7 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ApiMetadata.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ApiMetadata.java
@@ -41,12 +41,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class AWSEC2ApiMetadata extends EC2ApiMetadata {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -1492951757032303845L;
    
    public static final TypeToken<RestContext<AWSEC2Client, AWSEC2AsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<AWSEC2Client, AWSEC2AsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    private static Builder builder() {
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
index 03f82f9dc7..17fb1c381b 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/AWSEC2ProviderMetadata.java
@@ -37,9 +37,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Adrian Cole
  */
 public class AWSEC2ProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java
index b5c161e631..595ba7469d 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ApiMetadata.java
@@ -38,11 +38,7 @@ import com.google.inject.Module;
  */
 public class AWSS3ApiMetadata extends S3ApiMetadata {
    
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -1572520638079261710L;
-   
    public static final TypeToken<RestContext<AWSS3Client, AWSS3AsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<AWSS3Client, AWSS3AsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    private static Builder builder() {
diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
index f015e05b00..bdf58a38ef 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/AWSS3ProviderMetadata.java
@@ -44,9 +44,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Adrian Cole
  */
 public class AWSS3ProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 3727028894286338406L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java b/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java
index e53d6aeb63..130d977c0a 100644
--- a/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java
+++ b/providers/aws-sqs/src/main/java/org/jclouds/aws/sqs/AWSSQSProviderMetadata.java
@@ -43,9 +43,6 @@ import org.jclouds.sqs.SQSApiMetadata;
  * @author Adrian Cole
  */
 public class AWSSQSProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7750012233546655021L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java
index 8d47ff23d6..a33d699597 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobApiMetadata.java
@@ -40,11 +40,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class AzureBlobApiMetadata extends BaseRestApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8067252472547486854L;
 
    public static final TypeToken<RestContext<AzureBlobClient, AzureBlobAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<AzureBlobClient, AzureBlobAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    private static Builder builder() {
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java
index f51a997bb6..8b545dad36 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/AzureBlobProviderMetadata.java
@@ -31,9 +31,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class AzureBlobProviderMetadata extends BaseProviderMetadata {
    
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8271570736207734777L;
-   
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/BlobPropertiesImpl.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/BlobPropertiesImpl.java
index 4b64ee5788..7de02db6a1 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/BlobPropertiesImpl.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/BlobPropertiesImpl.java
@@ -20,7 +20,6 @@ package org.jclouds.azureblob.domain.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Date;
 import java.util.Map;
@@ -39,10 +38,8 @@ import com.google.common.collect.Maps;
  * 
  * @author Adrian Cole
  */
-public class BlobPropertiesImpl implements Serializable, BlobProperties {
+public class BlobPropertiesImpl implements BlobProperties {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4648755473986695062L;
    private final BlobType type;
    private final String name;
    private final String container;
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/ContainerPropertiesImpl.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/ContainerPropertiesImpl.java
index 03bbfab354..79e96fb2e7 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/ContainerPropertiesImpl.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/ContainerPropertiesImpl.java
@@ -20,7 +20,6 @@ package org.jclouds.azureblob.domain.internal;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Date;
 import java.util.Map;
@@ -34,10 +33,7 @@ import com.google.common.collect.Maps;
  * 
  * @author Adrian Cole
  */
-public class ContainerPropertiesImpl implements Serializable, ContainerProperties {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4648755473986695062L;
+public class ContainerPropertiesImpl implements ContainerProperties {
 
    private final String name;
    private final URI url;
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/HashSetListBlobsResponse.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/HashSetListBlobsResponse.java
index 1c176580cf..772fa082d6 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/HashSetListBlobsResponse.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/HashSetListBlobsResponse.java
@@ -35,8 +35,6 @@ import com.google.common.collect.Sets;
  */
 public class HashSetListBlobsResponse extends BoundedHashSet<BlobProperties> implements
          ListBlobsResponse {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4475709781001190244L;
 
    protected final String delimiter;
    protected final Set<String> blobPrefixes = Sets.newHashSet();
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java
index 05938b3cbc..bf695ebf08 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableBlobPropertiesImpl.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.azureblob.domain.internal;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Date;
 import java.util.Map;
@@ -38,10 +37,7 @@ import com.google.common.collect.Maps;
  * 
  * @author Adrian Cole
  */
-public class MutableBlobPropertiesImpl implements Serializable, MutableBlobProperties {
-
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4648755473986695062L;
+public class MutableBlobPropertiesImpl implements MutableBlobProperties {
 
    private BlobType type = BlobType.BLOCK_BLOB;
    private LeaseStatus leaseStatus = LeaseStatus.UNLOCKED;
diff --git a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java
index f5602d7f4d..655ef5bef1 100644
--- a/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java
+++ b/providers/azureblob/src/main/java/org/jclouds/azureblob/domain/internal/MutableContainerPropertiesWithMetadataImpl.java
@@ -18,7 +18,6 @@
  */
 package org.jclouds.azureblob.domain.internal;
 
-import java.io.Serializable;
 import java.net.URI;
 import java.util.Date;
 import java.util.Map;
@@ -33,12 +32,9 @@ import com.google.common.collect.Maps;
  * 
  * @author Adrian Cole
  */
-public class MutableContainerPropertiesWithMetadataImpl implements Serializable,
+public class MutableContainerPropertiesWithMetadataImpl implements
          MutableContainerPropertiesWithMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4648755473986695062L;
-
    private String name;
    private URI url;
    private Date lastModified;
diff --git a/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java b/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java
index c2e75dd283..d7bd34a27e 100644
--- a/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java
+++ b/providers/bluelock-vcloud-zone01/src/main/java/org/jclouds/bluelock/vcloud/zone01/BluelockVCloudZone01ProviderMetadata.java
@@ -34,9 +34,6 @@ import org.jclouds.vcloud.VCloudApiMetadata;
  */
 public class BluelockVCloudZone01ProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -2931858111365760610L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java b/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java
index 93e203c54d..6a41cd0f40 100644
--- a/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java
+++ b/providers/cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUKProviderMetadata.java
@@ -34,9 +34,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class CloudFilesUKProviderMetadata extends BaseProviderMetadata {
    
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7285715683919401020L;
-   
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java
index ca195602b0..72448afa35 100644
--- a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java
+++ b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java
@@ -33,9 +33,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Adrian Cole
  */
 public class CloudFilesUSProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -106955085607133771L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderMetadata.java b/providers/cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderMetadata.java
index 53ab407c29..fa362b3ac2 100644
--- a/providers/cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderMetadata.java
+++ b/providers/cloudloadbalancers-uk/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUKProviderMetadata.java
@@ -41,9 +41,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class CloudLoadBalancersUKProviderMetadata extends BaseProviderMetadata {
    
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 5566019798179959163L;
-   
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderMetadata.java b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderMetadata.java
index fcdc07c3e7..668c093e00 100644
--- a/providers/cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderMetadata.java
+++ b/providers/cloudloadbalancers-us/src/main/java/org/jclouds/rackspace/cloudloadbalancers/CloudLoadBalancersUSProviderMetadata.java
@@ -43,9 +43,6 @@ import com.google.common.base.Joiner;
  * @author Adrian Cole
  */
 public class CloudLoadBalancersUSProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -1336822093264044850L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java b/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java
index 63ec2295fc..d349205b43 100644
--- a/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java
+++ b/providers/cloudonestorage/src/main/java/org/jclouds/cloudonestorage/CloudOneStorageProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Jeremy Whitlock <jwhitlock@apache.org>
  */
 public class CloudOneStorageProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java b/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java
index 5a07fa8d09..b975a5f002 100644
--- a/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java
+++ b/providers/cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUKProviderMetadata.java
@@ -34,9 +34,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class CloudServersUKProviderMetadata extends BaseProviderMetadata {
    
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 4295911433196692746L;
-   
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java b/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java
index 1c2c7747ed..3360de4cdb 100644
--- a/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java
+++ b/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java
@@ -33,9 +33,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Adrian Cole
  */
 public class CloudServersUSProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8728307961498165226L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java b/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java
index c42718f1a0..ba0fc2c074 100644
--- a/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java
+++ b/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class CloudSigmaLasVegasProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7837335150409122683L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java
index dc0224a5fe..600a74c62a 100644
--- a/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java
+++ b/providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/CloudSigmaZurichProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class CloudSigmaZurichProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -7104853865766042528L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java b/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java
index 809a948fc1..b4216c3967 100644
--- a/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java
+++ b/providers/elastichosts-lax-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LosAngelesProviderMetadata.java
@@ -33,9 +33,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class ElasticHostsPeer1LosAngelesProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4027094214969340248L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java b/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java
index 016c94f297..3094866ad3 100644
--- a/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java
+++ b/providers/elastichosts-lon-b/src/main/java/org/jclouds/elastichosts/ElasticHostsBlueSquareLondonProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class ElasticHostsBlueSquareLondonProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 5409915816774748887L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java b/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java
index edf5e62ab9..3365bc866b 100644
--- a/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java
+++ b/providers/elastichosts-lon-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1LondonProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class ElasticHostsPeer1LondonProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 5018671212772677582L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java b/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java
index a577a21221..e9bdb72c20 100644
--- a/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java
+++ b/providers/elastichosts-sat-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1SanAntonioProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class ElasticHostsPeer1SanAntonioProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -8914180153534735692L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java b/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java
index ef15da0dc4..23152f2ce1 100644
--- a/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java
+++ b/providers/elastichosts-tor-p/src/main/java/org/jclouds/elastichosts/ElasticHostsPeer1TorontoProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class ElasticHostsPeer1TorontoProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 3573428301472783315L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java
index 9007cf103a..465661fc7e 100644
--- a/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java
+++ b/providers/eucalyptus-partnercloud-ec2/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudEC2ProviderMetadata.java
@@ -41,9 +41,6 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class EucalyptusPartnerCloudEC2ProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 7625722444851538962L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java
index 731b5b33c5..ec1c2c6090 100644
--- a/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java
+++ b/providers/eucalyptus-partnercloud-s3/src/main/java/org/jclouds/epc/EucalyptusPartnerCloudS3ProviderMetadata.java
@@ -37,9 +37,6 @@ import org.jclouds.walrus.WalrusApiMetadata;
  * @author Adrian Cole
  */
 public class EucalyptusPartnerCloudS3ProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSApiMetadata.java b/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSApiMetadata.java
index 357d6bcfb5..ed637ac1b6 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSApiMetadata.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSApiMetadata.java
@@ -38,12 +38,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class GleSYSApiMetadata extends BaseRestApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<GleSYSApi, GleSYSAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<GleSYSApi, GleSYSAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java b/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java
index fc272cc46d..431268e755 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java
@@ -35,9 +35,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class GleSYSProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 539076518401969165L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java b/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java
index 9c73c1a8a2..e32e145dba 100644
--- a/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java
+++ b/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java
@@ -33,9 +33,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class Go2CloudJohannesburg1ProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 5737728330686182812L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridApiMetadata.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridApiMetadata.java
index 13abb975ce..26b9169464 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridApiMetadata.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridApiMetadata.java
@@ -38,11 +38,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class GoGridApiMetadata extends BaseRestApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<GoGridClient, GoGridAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<GoGridClient, GoGridAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java
index 9a192cfa02..b371746a58 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridProviderMetadata.java
@@ -36,9 +36,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class GoGridProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 503149209800711396L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridResponseException.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridResponseException.java
index c61c6275c0..60e4b97c6a 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridResponseException.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/GoGridResponseException.java
@@ -32,8 +32,6 @@ import org.jclouds.http.HttpResponseException;
  */
 public class GoGridResponseException extends HttpResponseException {
 
-    private static final long serialVersionUID = 1924589L;
-
     private Set<ErrorResponse> errors;
 
     public GoGridResponseException(HttpCommand command, HttpResponse response, Set<ErrorResponse> errors) {
diff --git a/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java b/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java
index 997c8dab6c..791b959e8d 100644
--- a/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java
+++ b/providers/greenhousedata-element-vcloud/src/main/java/org/jclouds/greenhousedata/element/vcloud/GreenHouseDataElementVCloudProviderMetadata.java
@@ -39,9 +39,6 @@ import com.google.inject.Module;
  */
 public class GreenHouseDataElementVCloudProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8503534430849704022L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
index c7a547043e..85010435b7 100644
--- a/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
+++ b/providers/hpcloud-compute/src/main/java/org/jclouds/hpcloud/compute/HPCloudComputeProviderMetadata.java
@@ -46,9 +46,6 @@ import com.google.inject.Module;
  */
 public class HPCloudComputeProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -300987074165012648L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMetadata.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMetadata.java
index 2387fea15e..6b325d9c4c 100644
--- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMetadata.java
+++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageApiMetadata.java
@@ -46,11 +46,7 @@ import com.google.inject.Module;
  */
 public class HPCloudObjectStorageApiMetadata extends SwiftKeystoneApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 820062881469203616L;
-
    public static final TypeToken<RestContext<HPCloudObjectStorageApi, HPCloudObjectStorageAsyncApi>> CONTEXT_TOKEN = new TypeToken<RestContext<HPCloudObjectStorageApi, HPCloudObjectStorageAsyncApi>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
 
    private static Builder builder() {
diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java
index 23b67d8fdd..aa2e745b21 100644
--- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java
+++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/HPCloudObjectStorageProviderMetadata.java
@@ -33,9 +33,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class HPCloudObjectStorageProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -3735142654912867384L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java b/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java
index 804addad12..e4ce48d01a 100644
--- a/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java
+++ b/providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java
@@ -16,9 +16,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class NinefoldComputeProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -4496340915519024L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java b/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java
index e3306bb398..6cb1be9741 100644
--- a/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java
+++ b/providers/ninefold-storage/src/main/java/org/jclouds/ninefold/storage/NinefoldStorageProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Jeremy Whitlock <jwhitlock@apache.org>
  */
 public class NinefoldStorageProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java b/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java
index feb8aa1b63..eb2a76eb46 100644
--- a/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java
+++ b/providers/openhosting-east1/src/main/java/org/jclouds/openhosting/OpenHostingEast1ProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class OpenHostingEast1ProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java b/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java
index 62cc75035c..c23106734c 100644
--- a/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java
+++ b/providers/rackspace-cloudblockstorage-uk/src/main/java/org/jclouds/rackspace/cloudblockstorage/uk/CloudBlockStorageUKProviderMetadata.java
@@ -44,7 +44,6 @@ import com.google.inject.Module;
  * @author Everett Toews
  */
 public class CloudBlockStorageUKProviderMetadata extends BaseProviderMetadata {
-   private static final long serialVersionUID = -620987914134012695L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java
index 09f82e24d0..69fafc18a1 100644
--- a/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java
+++ b/providers/rackspace-cloudblockstorage-us/src/main/java/org/jclouds/rackspace/cloudblockstorage/us/CloudBlockStorageUSProviderMetadata.java
@@ -44,7 +44,6 @@ import com.google.inject.Module;
  * @author Everett Toews
  */
 public class CloudBlockStorageUSProviderMetadata extends BaseProviderMetadata {
-   private static final long serialVersionUID = -290987074134012652L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java b/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java
index d84effa2b3..9202e9c4fd 100644
--- a/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java
+++ b/providers/rackspace-cloudservers-uk/src/main/java/org/jclouds/rackspace/cloudservers/uk/CloudServersUKProviderMetadata.java
@@ -46,9 +46,6 @@ import com.google.inject.Module;
  */
 public class CloudServersUKProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -300987074165012648L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java
index 845b3d2650..059d340e57 100644
--- a/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java
+++ b/providers/rackspace-cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/us/CloudServersUSProviderMetadata.java
@@ -46,9 +46,6 @@ import com.google.inject.Module;
  */
 public class CloudServersUSProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -300987074165012648L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingApiMetadata.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingApiMetadata.java
index f1fd61f568..613ad43778 100644
--- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingApiMetadata.java
+++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingApiMetadata.java
@@ -44,11 +44,7 @@ import com.google.inject.Module;
  */
 public class RimuHostingApiMetadata extends BaseRestApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
-
    public static final TypeToken<RestContext<RimuHostingClient, RimuHostingAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<RimuHostingClient, RimuHostingAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingProviderMetadata.java b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingProviderMetadata.java
index bd98650543..5a95586f6d 100644
--- a/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingProviderMetadata.java
+++ b/providers/rimuhosting/src/main/java/org/jclouds/rimuhosting/miro/RimuHostingProviderMetadata.java
@@ -35,9 +35,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class RimuHostingProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8802226645589501365L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java b/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java
index 2513bd392e..ebee512a30 100644
--- a/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java
+++ b/providers/serverlove-z1-man/src/main/java/org/jclouds/serverlove/ServerloveManchesterProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class ServerloveManchesterProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -8799752320729476294L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java b/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java
index 13b5b92eb7..8ced49adf2 100644
--- a/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java
+++ b/providers/skalicloud-sdg-my/src/main/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderMetadata.java
@@ -32,9 +32,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  */
 public class SkaliCloudMalaysiaProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 102653451946303901L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostApiMetadata.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostApiMetadata.java
index f71c699bdd..b11c086b76 100644
--- a/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostApiMetadata.java
+++ b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostApiMetadata.java
@@ -38,11 +38,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class SlicehostApiMetadata extends BaseRestApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<SlicehostClient, SlicehostAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<SlicehostClient, SlicehostAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostProviderMetadata.java b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostProviderMetadata.java
index 4a81695c31..3b33a1c590 100644
--- a/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostProviderMetadata.java
+++ b/providers/slicehost/src/main/java/org/jclouds/slicehost/SlicehostProviderMetadata.java
@@ -14,9 +14,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Adrian Cole
  */
 public class SlicehostProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -5260230633956988685L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerApiMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerApiMetadata.java
index 6f37cda35d..3a500c0d47 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerApiMetadata.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerApiMetadata.java
@@ -38,11 +38,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class SoftLayerApiMetadata extends BaseRestApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 6725672099385580694L;
 
    public static final TypeToken<RestContext<SoftLayerClient, SoftLayerAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<SoftLayerClient, SoftLayerAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
index b445def49f..595166f4b9 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
@@ -41,9 +41,6 @@ import com.google.common.collect.ImmutableSet;
  */
 public class SoftLayerProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 2196535609684739834L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/stratogen-vcloud-mycloud/src/main/java/org/jclouds/stratogen/vcloud/mycloud/StratoGenVCloudMyCloudProviderMetadata.java b/providers/stratogen-vcloud-mycloud/src/main/java/org/jclouds/stratogen/vcloud/mycloud/StratoGenVCloudMyCloudProviderMetadata.java
index 4f108d2f96..2e31d42156 100644
--- a/providers/stratogen-vcloud-mycloud/src/main/java/org/jclouds/stratogen/vcloud/mycloud/StratoGenVCloudMyCloudProviderMetadata.java
+++ b/providers/stratogen-vcloud-mycloud/src/main/java/org/jclouds/stratogen/vcloud/mycloud/StratoGenVCloudMyCloudProviderMetadata.java
@@ -40,9 +40,6 @@ import com.google.inject.Module;
  */
 public class StratoGenVCloudMyCloudProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -113107768473491412L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java b/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java
index 0072336eb0..142940e444 100644
--- a/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java
+++ b/providers/synaptic-storage/src/main/java/org/jclouds/synaptic/storage/SynapticStorageProviderMetadata.java
@@ -14,9 +14,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Jeremy Whitlock <jwhitlock@apache.org>
  */
 public class SynapticStorageProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 1L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApiMetadata.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApiMetadata.java
index 39966c7659..95f89fd35b 100644
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApiMetadata.java
+++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudApiMetadata.java
@@ -23,11 +23,7 @@ import com.google.inject.Module;
  */
 public class TerremarkECloudApiMetadata extends TerremarkVCloudApiMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -6212626084139698761L;
-
    public static final TypeToken<RestContext<TerremarkECloudClient, TerremarkECloudAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<TerremarkECloudClient, TerremarkECloudAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java
index a443ccfbff..79f9cd652c 100644
--- a/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java
+++ b/providers/trmk-ecloud/src/main/java/org/jclouds/trmk/ecloud/TerremarkECloudProviderMetadata.java
@@ -30,9 +30,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Adrian Cole
  */
 public class TerremarkECloudProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -759809591681141530L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiMetadata.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiMetadata.java
index f307436353..0dc7ddc7c6 100644
--- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiMetadata.java
+++ b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressApiMetadata.java
@@ -40,11 +40,8 @@ import com.google.inject.Module;
  * @author Adrian Cole
  */
 public class TerremarkVCloudExpressApiMetadata extends TerremarkVCloudApiMetadata {
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -6212626084139698761L;
 
    public static final TypeToken<RestContext<TerremarkVCloudExpressClient, TerremarkVCloudExpressAsyncClient>> CONTEXT_TOKEN = new TypeToken<RestContext<TerremarkVCloudExpressClient, TerremarkVCloudExpressAsyncClient>>() {
-      private static final long serialVersionUID = -5070937833892503232L;
    };
    
    @Override
diff --git a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java
index 404fff8d35..e33a9a35e8 100644
--- a/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java
+++ b/providers/trmk-vcloudexpress/src/main/java/org/jclouds/trmk/vcloudexpress/TerremarkVCloudExpressProviderMetadata.java
@@ -30,9 +30,6 @@ import org.jclouds.providers.internal.BaseProviderMetadata;
  * @author Adrian Cole
  */
 public class TerremarkVCloudExpressProviderMetadata extends BaseProviderMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -7993337019540975194L;
 
    public static Builder builder() {
       return new Builder();
diff --git a/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaProviderMetadata.java b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaProviderMetadata.java
index 206f1d2697..72205dd3c5 100644
--- a/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaProviderMetadata.java
+++ b/providers/trystack-nova/src/main/java/org/jclouds/trystack/nova/TryStackNovaProviderMetadata.java
@@ -43,9 +43,6 @@ import com.google.inject.Module;
  */
 public class TryStackNovaProviderMetadata extends BaseProviderMetadata {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = -8567407993297259224L;
-
    public static Builder builder() {
       return new Builder();
    }
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index 9891069849..e1cd59e8b9 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -24,6 +24,9 @@
         <module name="SimplifyBooleanExpression"/>
         <module name="UnnecessaryParentheses"/>
         <module name="UnusedImports"/>
+        <module name="InterfaceIsType">
+            <property name="allowMarkerInterfaces" value="false"/>
+        </module>
     </module>
     <module name="RegexpMultiline">
         <property name="format" value="=\s*new ArrayList&lt;[^&gt;]"/>
diff --git a/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/ContainerListImpl.java b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/ContainerListImpl.java
index d0fb6b3eb7..fa9ae65dfd 100644
--- a/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/ContainerListImpl.java
+++ b/sandbox-apis/pcs/src/main/java/org/jclouds/mezeo/pcs/domain/internal/ContainerListImpl.java
@@ -35,8 +35,6 @@ import org.jclouds.mezeo.pcs.domain.ResourceInfo;
  */
 public class ContainerListImpl extends TreeSet<ResourceInfo> implements ContainerList {
 
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 8147941177495755603L;
    private final ResourceInfo info;
    private final Map<String, URI> metadataItems;
 
diff --git a/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java
index 772a54e15d..26e7d6e86d 100644
--- a/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java
+++ b/sandbox-apis/simpledb/src/main/java/org/jclouds/simpledb/xml/ListDomainsResponseHandler.java
@@ -51,7 +51,6 @@ public class ListDomainsResponseHandler extends ParseSax.HandlerWithResult<ListD
 
    public static class ListDomainsResponseImpl extends LinkedHashSet<String> implements ListDomainsResponse {
 
-      private static final long serialVersionUID = 1L;
       private final String nextToken;
 
       public ListDomainsResponseImpl(Iterable<String> domains, String nextToken) {
diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functionloader/FunctionNotFoundException.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functionloader/FunctionNotFoundException.java
index 9c584123d9..ba0650997a 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functionloader/FunctionNotFoundException.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/functionloader/FunctionNotFoundException.java
@@ -21,10 +21,6 @@ package org.jclouds.scriptbuilder.functionloader;
 import org.jclouds.scriptbuilder.domain.OsFamily;
 
 public class FunctionNotFoundException extends RuntimeException {
-  /**
-   * The serialVersionUID
-   */
-  private static final long serialVersionUID = 1L;
 
   public FunctionNotFoundException(String functionName, OsFamily family) {
     super("function: " + functionName + " not found for family: " + family);
diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java
index 5c5a700601..ebfb58d9f3 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java
@@ -63,8 +63,6 @@ import com.google.common.collect.ImmutableMap;
 
 public class AdminAccessBuilderSpec {
 
-   private static final long serialVersionUID = -379469670373111569L;
-
    /** Parses a single value. */
    protected static interface ValueParser {
       void parse(AdminAccessBuilderSpec spec, String key, @Nullable String value);
diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java
index 1d609efac7..55d41df985 100644
--- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java
+++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/ServerManagerApiMetadata.java
@@ -12,9 +12,6 @@ import org.jclouds.servermanager.compute.config.ServerManagerComputeServiceConte
  * @author Adrian Cole
  */
 public class ServerManagerApiMetadata extends BaseApiMetadata {
-   
-   /** The serialVersionUID */
-   private static final long serialVersionUID = 3606170564482119304L;
 
    public static Builder builder() {
       return new Builder();