JCLOUDS-546: Remove Javadoc @author annotations

Annotations removed with:

find -name \*.java | xargs sed -i /@author/d

Empty Javadoc removed with multiple iterations of:

find -name \*.java | xargs sed -i -z 's/ \*\n \*\// \*\//'
find -name \*.java | xargs sed -i -z 's/ \* \n \*\// \*\//'
find -name \*.java | xargs sed -i -z 's/\/\*\*\n \*\/\n//'
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/functions/ZoneToEndpointNegotiateVersion.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/functions/ZoneToEndpointNegotiateVersion.java
index 5524bfc..7f5779d 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/functions/ZoneToEndpointNegotiateVersion.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/functions/ZoneToEndpointNegotiateVersion.java
@@ -50,10 +50,6 @@
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.Iterables;
 
-/**
- *
- * @author Jasdeep Hundal
- */
 @Singleton
 public class ZoneToEndpointNegotiateVersion implements Function<Object, URI> {
 
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java
index c962eec..2f8ba61 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApi.java
@@ -34,7 +34,6 @@
  * <p/>
  * 
  * @see <a href="http://glance.openstack.org/glanceapi.html">api doc</a>
- * @author Adrian Cole
  */
 public interface GlanceApi extends Closeable {
    /**
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
index 667fa8b..cf546fa 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadata.java
@@ -35,8 +35,6 @@
 
 /**
  * Implementation of {@link ApiMetadata} for Glance 1.0 API
- * 
- * @author Adrian Cole
  */
 public class GlanceApiMetadata extends BaseHttpApiMetadata<GlanceApi> {
 
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceHttpApiModule.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceHttpApiModule.java
index b1f4e2b..62553fe 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceHttpApiModule.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceHttpApiModule.java
@@ -47,8 +47,6 @@
 
 /**
  * Configures the Glance connection.
- * 
- * @author Adrian Cole
  */
 @ConfiguresHttpApi
 public class GlanceHttpApiModule extends HttpApiModule<GlanceApi> {
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceProperties.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceProperties.java
index 65fa044..63277d8 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceProperties.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/config/GlanceProperties.java
@@ -18,8 +18,6 @@
 
 /**
  * Configuration properties and constants used in openstack Glance connections.
- *
- * @author Adrian Cole
  */
 public class GlanceProperties {
 
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ContainerFormat.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ContainerFormat.java
index bb112cf..08968e0 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ContainerFormat.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ContainerFormat.java
@@ -28,7 +28,6 @@
  * components, so it is safe to simply specify {@link #BARE} as the container format if you are
  * unsure.
  * 
- * @author Adrian Cole
  * @see <a href= "http://glance.openstack.org/formats.html" />
  */
 public enum ContainerFormat {
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/DiskFormat.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/DiskFormat.java
index 1dd0ca8..4861d86 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/DiskFormat.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/DiskFormat.java
@@ -23,7 +23,6 @@
  * appliance vendors have different formats for laying out the information contained in a virtual
  * machine disk image.
  * 
- * @author Adrian Cole
  * @see <a href= "http://glance.openstack.org/formats.html" />
  */
 public enum DiskFormat {
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
index 5ec2a6a..6b91df6 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
@@ -32,7 +32,6 @@
 /**
  * An image the Glance server knows about
  *
- * @author Adrian Cole
  * @see <a href= "http://glance.openstack.org/glanceapi.html" />
  * @see <a href= "https://github.com/openstack/glance/blob/master/glance/api/v1/images.py" />
  */
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java
index ca781cc..d950556 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java
@@ -36,7 +36,6 @@
 /**
  * Detailed listing of an Image
  *
- * @author Adrian Cole
  * @see <a href= "http://glance.openstack.org/glanceapi.html" />
  * @see <a href= "https://github.com/openstack/glance/blob/master/glance/api/v1/images.py" />
  * @see <a href= "https://github.com/openstack/glance/blob/master/glance/registry/db/api.py" />
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/StoreType.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/StoreType.java
index d21b178..ea782f4 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/StoreType.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/StoreType.java
@@ -19,7 +19,6 @@
 /**
  * Backing store types for glance images
  * 
- * @author Adam Lowe
  * @see <a href= "http://glance.openstack.org/architecture.html#what-is-a-store" />
  */
 public enum StoreType {
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageApi.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageApi.java
index b8b4c75..033ee51 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageApi.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/features/ImageApi.java
@@ -58,8 +58,6 @@
 /**
  * Image Services
  * 
- * @author Adrian Cole
- * @author Adam Lowe
  * @see <a href="http://glance.openstack.org/glanceapi.html">api doc</a>
  * @see <a
  *      href="https://github.com/openstack/glance/blob/master/glance/api/v1/images.py">api
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeaders.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeaders.java
index a85175e..e683a7c 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeaders.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeaders.java
@@ -45,8 +45,6 @@
 
 /**
  * This parses {@link ImageDetails} from HTTP headers.
- * 
- * @author Adrian Cole
  */
 public class ParseImageDetailsFromHeaders implements Function<HttpResponse, ImageDetails> {
    private final DateService dateService;
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java
index 82037f5..49ef9c1 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImageDetails.java
@@ -46,8 +46,6 @@
 
 /**
  * boiler plate until we determine a better way
- * 
- * @author Adrian Cole
  */
 @Beta
 @Singleton
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java
index 23de00d..5d02694 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/functions/internal/ParseImages.java
@@ -46,8 +46,6 @@
 
 /**
  * boiler plate until we determine a better way
- * 
- * @author Adrian Cole
  */
 @Beta
 @Singleton
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandler.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandler.java
index 3659dda..67412f2 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandler.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandler.java
@@ -30,9 +30,6 @@
 
 /**
  * This will parse and set an appropriate exception on the command object.
- * 
- * @author Adrian Cole
- * 
  */
 // TODO: is there error spec someplace? let's type errors, etc.
 @Singleton
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/CreateImageOptions.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/CreateImageOptions.java
index 9ad42b1..e4a70ce 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/CreateImageOptions.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/CreateImageOptions.java
@@ -33,7 +33,6 @@
  * details = api.create("imageName", minDisk(10), isPublic(true), property("mykey", "somevalue"));
  * <code>
 
- * @author Adam Lowe
  * @see <a href="http://glance.openstack.org/glanceapi.html"/>
  */
 public class CreateImageOptions extends UpdateImageOptions {
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java
index e070fe1..2e69f88 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/ListImageOptions.java
@@ -46,7 +46,6 @@
  * list = api.list(name("newName"), limit(10), minDisk(5));
  * <code>
  * 
- * @author Adam Lowe
  * @see <a href="http://glance.openstack.org/glanceapi.html"/>
  */
 public class ListImageOptions extends PaginationOptions {
diff --git a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/UpdateImageOptions.java b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/UpdateImageOptions.java
index 5701b8d..72c59a3 100644
--- a/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/UpdateImageOptions.java
+++ b/openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/options/UpdateImageOptions.java
@@ -46,7 +46,6 @@
  * // this will adjust the image with id 'id' the name "newName", minimum required disk of 5GB, etc. 
  * details = api.update(id, name("newName"), minDisk(5), isPublic(true), property("mykey", "somevalue"));
  * <code>
- * @author Adam Lowe
  * @see <a href="http://glance.openstack.org/glanceapi.html"/>
  */
 public class UpdateImageOptions extends BaseHttpRequestOptions {
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadataTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadataTest.java
index dd1b856..0ecad2e 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadataTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/GlanceApiMetadataTest.java
@@ -23,10 +23,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.reflect.TypeToken;
 
-/**
- * 
- * @author Adrian Cole
- */
 @Test(groups = "unit", testName = "GlanceApiMetadataTest")
 public class GlanceApiMetadataTest extends BaseApiMetadataTest {
    public GlanceApiMetadataTest() {
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/GlanceVersionNegotiationExpectTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/GlanceVersionNegotiationExpectTest.java
index 5f8062e..26febe9 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/GlanceVersionNegotiationExpectTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/GlanceVersionNegotiationExpectTest.java
@@ -25,9 +25,6 @@
 import org.jclouds.openstack.glance.v1_0.parse.ParseImagesTest;
 import org.testng.annotations.Test;
 
-/**
- * @author Jasdeep Hundal
- */
 @Test(groups = "unit", testName = "GlanceVersionNegotiationExpectTest")
 public class GlanceVersionNegotiationExpectTest extends BaseGlanceApiExpectTest {
 
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
index d200422..cff2d91 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiExpectTest.java
@@ -42,10 +42,6 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
 
-/**
- * @author Adrian Cole
- * @author Adam Lowe
- */
 @Test(groups = "unit", testName = "ImageApiExpectTest")
 public class ImageApiExpectTest extends BaseGlanceApiExpectTest {
 
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiLiveTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiLiveTest.java
index 6199fa3..c624224 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiLiveTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/features/ImageApiLiveTest.java
@@ -36,10 +36,6 @@
 
 import com.google.common.collect.Iterables;
 
-/**
- * @author Adrian Cole
- * @author Adam Lowe
- */
 @Test(groups = "live", testName = "ImageApiLiveTest")
 public class ImageApiLiveTest extends BaseGlanceApiLiveTest {
 
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeadersTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeadersTest.java
index e24da56..bdb64e0 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeadersTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/functions/ParseImageDetailsFromHeadersTest.java
@@ -28,10 +28,6 @@
 
 import com.google.common.collect.ImmutableMultimap;
 
-/**
- * 
- * @author Adrian Cole
- */
 @Test(groups = "unit", testName = "ParseImageDetailsFromHeadersTest")
 public class ParseImageDetailsFromHeadersTest {
 
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandlerTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandlerTest.java
index 3c54ed7..f60d944 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandlerTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/handlers/GlanceErrorHandlerTest.java
@@ -35,11 +35,6 @@
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 
-/**
- * 
- * @author Adrian Cole
- * @author Jasdeep Hundal
- */
 @Test(groups = "unit", testName = "GlanceErrorHandlerTest")
 public class GlanceErrorHandlerTest {
 
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiExpectTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiExpectTest.java
index 36c2229..10fd751 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiExpectTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiExpectTest.java
@@ -20,8 +20,6 @@
 
 /**
  * Base class for writing KeyStone Rest Api Expect tests
- * 
- * @author Adrian Cole
  */
 public class BaseGlanceApiExpectTest extends BaseGlanceExpectTest<GlanceApi> {
 
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiLiveTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiLiveTest.java
index c3b898e..38d41bd 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiLiveTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceApiLiveTest.java
@@ -25,8 +25,6 @@
 
 /**
  * Tests behavior of {@code GlanceApi}
- * 
- * @author Adrian Cole
  */
 @Test(groups = "live")
 public class BaseGlanceApiLiveTest extends BaseApiLiveTest<GlanceApi> {
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java
index 6267b43..6b2b680 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/internal/BaseGlanceExpectTest.java
@@ -24,8 +24,6 @@
 
 /**
  * Base class for writing Glance Expect tests
- * 
- * @author Adrian Cole
  */
 public class BaseGlanceExpectTest<T> extends BaseRestApiExpectTest<T> {
    protected HttpRequest keystoneAuthWithUsernameAndPassword;
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImageDetailsTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImageDetailsTest.java
index db0e398..5314223 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImageDetailsTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImageDetailsTest.java
@@ -28,10 +28,6 @@
 import org.jclouds.rest.annotations.SelectJson;
 import org.testng.annotations.Test;
 
-/**
- * 
- * @author Adam Lowe
- */
 @Test(groups = "unit", testName = "ParseImageDetailTest")
 public class ParseImageDetailsTest extends BaseItemParserTest<ImageDetails> {
 
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesInDetailTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesInDetailTest.java
index cf311c1..fa4b6d9 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesInDetailTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesInDetailTest.java
@@ -32,10 +32,6 @@
 
 import com.google.common.collect.ImmutableSet;
 
-/**
- * 
- * @author Adrian Cole
- */
 @Test(groups = "unit", testName = "ParseImageDetailsListTest")
 public class ParseImagesInDetailTest extends BaseSetParserTest<ImageDetails> {
 
diff --git a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesTest.java b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesTest.java
index aef16e1..441165d 100644
--- a/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesTest.java
+++ b/openstack-glance/src/test/java/org/jclouds/openstack/glance/v1_0/parse/ParseImagesTest.java
@@ -30,10 +30,6 @@
 
 import com.google.common.collect.ImmutableSet;
 
-/**
- * 
- * @author Adrian Cole
- */
 @Test(groups = "unit", testName = "ParseImageListTest")
 public class ParseImagesTest extends BaseSetParserTest<Image> {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java
index 854da91..8fc2eea 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApi.java
@@ -35,8 +35,6 @@
 
 /**
  * Marconi is a robust, web-scale message queuing service to support the distributed nature of large web applications.
- *
- * @author Everett Toews
  */
 public interface MarconiApi extends Closeable {
    /**
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java
index 7997557..093b267 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/MarconiApiMetadata.java
@@ -37,8 +37,6 @@
 
 /**
  * Implementation of {@link org.jclouds.apis.ApiMetadata} for Marconi 1.0 API
- *
- * @author Everett Toews
  */
 public class MarconiApiMetadata extends BaseHttpApiMetadata<MarconiApi> {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/binders/BindIdsToQueryParam.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/binders/BindIdsToQueryParam.java
index dbacf0e..08079c0 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/binders/BindIdsToQueryParam.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/binders/BindIdsToQueryParam.java
@@ -25,9 +25,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-/**
- * @author Everett Toews
- */
 @Singleton
 public class BindIdsToQueryParam implements Binder {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java
index 4bebcc8..4ab6d14 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java
@@ -27,8 +27,6 @@
 
 /**
  * The age of messages in a queue.
- *
- * @author Everett Toews
  */
 public class Aged {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Claim.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Claim.java
index 638f55f..ee70e4e 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Claim.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Claim.java
@@ -27,8 +27,6 @@
 
 /**
  * A claim for messages in a queue.
- *
- * @author Everett Toews
  */
 public class Claim {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/CreateMessage.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/CreateMessage.java
index ec4720e..2421e09 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/CreateMessage.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/CreateMessage.java
@@ -24,8 +24,6 @@
 
 /**
  * A message to be sent to a queue.
- *
- * @author Everett Toews
  */
 public class CreateMessage {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Message.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Message.java
index cab61f7..e780bf5 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Message.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Message.java
@@ -25,8 +25,6 @@
 
 /**
  * A message to be sent to a queue.
- *
- * @author Everett Toews
  */
 public class Message {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesCreated.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesCreated.java
index 10e0ea6..912b4e9 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesCreated.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesCreated.java
@@ -27,8 +27,6 @@
 
 /**
  * The response to creating messages on a queue.
- *
- * @author Everett Toews
  */
 public class MessagesCreated {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesStats.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesStats.java
index cfcd441..33ef63d 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesStats.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesStats.java
@@ -25,8 +25,6 @@
 
 /**
  * Statistics on messages in this queue.
- *
- * @author Everett Toews
  */
 public class MessagesStats {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Queue.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Queue.java
index 844f474..d2069a2 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Queue.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Queue.java
@@ -27,8 +27,6 @@
 
 /**
  * A queue.
- *
- * @author Everett Toews
  */
 public class Queue {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java
index 5db8d23..f62c34b 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java
@@ -23,8 +23,6 @@
 
 /**
  * Queue statistics, including how many messages are in the queue.
- *
- * @author Everett Toews
  */
 public class QueueStats {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
index 7584d08..4bc21a7 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/ClaimApi.java
@@ -47,8 +47,6 @@
 
 /**
  * Provides access to Messages via their REST API.
- *
- * @author Everett Toews
  */
 @SkipEncoding({'/', '='})
 @RequestFilters(AuthenticateRequest.class)
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
index 70694dd..51c717e 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/MessageApi.java
@@ -52,8 +52,6 @@
 
 /**
  * Provides access to Messages via their REST API.
- *
- * @author Everett Toews
  */
 @SkipEncoding({'/', '='})
 @RequestFilters(AuthenticateRequest.class)
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
index be81eb4..8953683 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/features/QueueApi.java
@@ -51,8 +51,6 @@
 
 /**
  * Provides access to Queues via their REST API.
- *
- * @author Everett Toews
  */
 @SkipEncoding({'/', '='})
 @RequestFilters(AuthenticateRequest.class)
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseClaim.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseClaim.java
index 9b2fddc..6823ea0 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseClaim.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseClaim.java
@@ -33,9 +33,6 @@
 import static org.jclouds.openstack.marconi.v1.functions.ParseMessagesToStream.TO_ID_FROM_HREF;
 import static org.jclouds.openstack.marconi.v1.functions.ParseMessagesToStream.TO_MESSAGE;
 
-/**
- * @author Everett Toews
- */
 public class ParseClaim implements Function<HttpResponse, Claim> {
 
    protected static final Function<ClaimWithHref, Claim> TO_CLAIM = new Function<ClaimWithHref, Claim>() {
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessage.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessage.java
index 4864e80..732e595 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessage.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessage.java
@@ -27,9 +27,6 @@
 import static org.jclouds.openstack.marconi.v1.functions.ParseMessagesToStream.MessageWithHref;
 import static org.jclouds.openstack.marconi.v1.functions.ParseMessagesToStream.TO_MESSAGE;
 
-/**
- * @author Everett Toews
- */
 public class ParseMessage implements Function<HttpResponse, Message> {
 
    private final ParseJson<MessageWithHref> json;
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesCreated.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesCreated.java
index 3d38092..d672e84 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesCreated.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesCreated.java
@@ -30,8 +30,6 @@
 
 /**
  * This parses the messages created on a queue.
- * 
- * @author Everett Toews
  */
 public class ParseMessagesCreated implements Function<HttpResponse, MessagesCreated> {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesToList.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesToList.java
index c78f93b..e3745c7 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesToList.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesToList.java
@@ -30,9 +30,6 @@
 import static org.jclouds.openstack.marconi.v1.functions.ParseMessagesToStream.MessageWithHref;
 import static org.jclouds.openstack.marconi.v1.functions.ParseMessagesToStream.TO_MESSAGE;
 
-/**
- * @author Everett Toews
- */
 public class ParseMessagesToList implements Function<HttpResponse, List<Message>> {
 
    private final ParseJson<List<MessageWithHref>> json;
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesToStream.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesToStream.java
index dfbc17c..785f72c 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesToStream.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseMessagesToStream.java
@@ -36,9 +36,6 @@
 import static com.google.common.collect.Iterables.transform;
 import static org.jclouds.http.utils.Queries.queryParser;
 
-/**
- * @author Everett Toews
- */
 public class ParseMessagesToStream implements Function<HttpResponse, MessageStream> {
 
    private final ParseJson<MessagesWithHref> json;
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseQueueStats.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseQueueStats.java
index 264dc38..1ef0521 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseQueueStats.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseQueueStats.java
@@ -29,8 +29,6 @@
 
 /**
  * This parses the stats of a queue.
- * 
- * @author Everett
  */
 public class ParseQueueStats implements Function<HttpResponse, QueueStats> {
 
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseQueues.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseQueues.java
index c43e50f..e246338 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseQueues.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/ParseQueues.java
@@ -27,9 +27,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Everett Toews
- */
 public class ParseQueues implements Function<HttpResponse, PaginatedCollection<Queue>> {
 
    private final ParseJson<Queues> json;
diff --git a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/QueuesToPagedIterable.java b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/QueuesToPagedIterable.java
index 138ef43..53f5dfd 100644
--- a/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/QueuesToPagedIterable.java
+++ b/openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/functions/QueuesToPagedIterable.java
@@ -34,9 +34,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.jclouds.openstack.marconi.v1.options.ListQueuesOptions.Builder.queryParameters;
 
-/**
- * @author Everett Toews
- */
 @Beta
 public class QueuesToPagedIterable extends ArgsToPagedIterable.FromCaller<Queue, QueuesToPagedIterable> {
 
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
index 92dc349..5d5083f 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/ClaimApiMockTest.java
@@ -30,9 +30,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Everett Toews
- */
 @Test
 public class ClaimApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
    private static final UUID CLIENT_ID = UUID.fromString("3381af92-2b9e-11e3-b191-71861300734c");
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
index 0d29b26..fefa889 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
@@ -37,9 +37,6 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Everett Toews
- */
 @Test
 public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
    private static final UUID CLIENT_ID = UUID.fromString("3381af92-2b9e-11e3-b191-71861300734c");
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
index 8170f69..d632f2b 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
@@ -41,9 +41,6 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Everett Toews
- */
 @Test
 public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
    private static final UUID CLIENT_ID = UUID.fromString("3381af92-2b9e-11e3-b191-71861300734c");
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java
index 50e8776..045b98b 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java
@@ -37,7 +37,6 @@
  * Provides synchronous access to Neutron.
  * <p/>
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/">api doc</a>
  */
 public interface NeutronApi extends Closeable {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
index a102a31..4681d82 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
@@ -36,8 +36,6 @@
 
 /**
  * Implementation of {@link org.jclouds.apis.ApiMetadata} for Neutron 2.0 API
- *
- * @author Nick Livens
  */
 public class NeutronApiMetadata extends BaseHttpApiMetadata<NeutronApi> {
 
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/config/NeutronHttpApiModule.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/config/NeutronHttpApiModule.java
index dd4bdb1..fe3d74c 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/config/NeutronHttpApiModule.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/config/NeutronHttpApiModule.java
@@ -43,8 +43,6 @@
 
 /**
  * Configures the Neutron connection.
- * 
- * @author Nick Livens
  */
 @ConfiguresHttpApi
 public class NeutronHttpApiModule extends HttpApiModule<NeutronApi> {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java
index 0ffb44a..f81192e 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java
@@ -25,7 +25,6 @@
 /**
  * A Neutron Subnet Allocation Pool
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/Subnets.html">api doc</a>
  */
 public class AllocationPool {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java
index ec841ba..f2e4a0e 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java
@@ -24,8 +24,6 @@
 /**
  * A Neutron network used for creating networks in bulk
  * The only difference between this and the actual network are the missing fields id, tenantId, state & shared
- *
- * @author Nick Livens
  */
 public class BulkNetwork {
 
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java
index c888b03..91c2637 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java
@@ -27,8 +27,6 @@
 /**
  * A Neutron port used for creating ports in bulk
  * The only difference between this and the actual port are the missing fields id, tenantId & state
- *
- * @author Nick Livens
  */
 public class BulkPort {
 
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java
index fd318ee..c1eea45 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java
@@ -27,8 +27,6 @@
 /**
  * A Neutron subnet used for creating subnets in bulk
  * The only difference between this and the actual subnet are the missing fields id & tenantId
- *
- * @author Nick Livens
  */
 public class BulkSubnet {
 
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java
index d0c9c49..f5473ed 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java
@@ -23,8 +23,6 @@
 
 /**
  * Information on external gateway for the router
- *
- * @author Nick Livens
  */
 public class ExternalGatewayInfo {
 
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java
index a183fdc..c5dcb56 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java
@@ -25,7 +25,6 @@
 /**
  * A Neutron Subnet Host Route
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/Subnets.html">api doc</a>
  */
 public class HostRoute {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java
index 69943ad..689a53e 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java
@@ -21,9 +21,6 @@
 
 import java.beans.ConstructorProperties;
 
-/**
- * @author Nick Livens
- */
 public class IP {
 
    private String ipAddress;
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java
index 521780e..3aa1804 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java
@@ -26,7 +26,6 @@
 /**
  * A Neutron network
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/Networks.html">api doc</a>
  */
 public class Network extends ReferenceWithName {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/NetworkType.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/NetworkType.java
index 52de89b..b0f1d20 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/NetworkType.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/NetworkType.java
@@ -19,8 +19,6 @@
 
 /**
  * The type of Network
- *
- * @author Nick Livens
  */
 public enum NetworkType {
    LOCAL("local"), FLAT("flat"), VLAN("vlan"), GRE("gre");
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java
index 5ed55f0..75f491f 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java
@@ -27,7 +27,6 @@
 /**
  * A Neutron port
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/1.0/content/Ports.html">api doc</a>
  */
 public class Port extends ReferenceWithName {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java
index 53afde0..0458118 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java
@@ -26,7 +26,6 @@
 /**
  * Base class for beans in the Neutron v2.0 api
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/Networks.html">api doc</a>
  */
 public class Reference {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java
index 0fb4b8b..28db0be 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java
@@ -26,7 +26,6 @@
 /**
  * Base class for beans in the Neutron v2.0 api
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/Networks.html">api doc</a>
  */
 public class ReferenceWithName extends Reference {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java
index 7528d80..5096ed9 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java
@@ -24,7 +24,6 @@
 /**
  * A Neutron Router
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/router_ext_concepts.html">api doc</a>
  */
 public class Router extends ReferenceWithName {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java
index 7afe213..f1a9c70 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java
@@ -24,7 +24,6 @@
 /**
  * A Neutron Router Interface
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/router_add_interface.html">api doc</a>
  */
 public class RouterInterface {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/State.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/State.java
index 6d7dd00..e276df8 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/State.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/State.java
@@ -20,7 +20,6 @@
 /**
  * The possible state of an entity
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/Concepts-d1e369.html">api doc</a>
  */
 public enum State {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java
index aa41171..9faf8bd 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java
@@ -30,7 +30,6 @@
 /**
  * A Neutron subnet
  *
- * @author Nick Livens
  * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/Subnets.html">api doc</a>
  */
 public class Subnet extends ReferenceWithName {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java
index d4e137d..05d009c 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java
@@ -57,7 +57,6 @@
  * A logical entity for forwarding packets across internal subnets and NATting them on external
  * networks through an appropriate external gateway.
  *
- * @author Nick Livens
  * @see <a href=
  *      "http://docs.openstack.org/api/openstack-network/2.0/content/router_ext.html">api doc</a>
  */
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java
index 413db44..a8b819f 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApi.java
@@ -57,8 +57,6 @@
  * Each tenant can define one or more networks. A network is a virtual isolated layer-2 broadcast domain reserved to the
  * tenant. A tenant can create several ports for a network, and plug virtual interfaces into these ports.
  *
- * @author Adam Lowe
- * @author Nick Livens
  * @see <a href=
  *      "http://docs.openstack.org/api/openstack-network/2.0/content/Networks.html">api doc</a>
  */
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java
index 2ccca5e..c19b77b 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/PortApi.java
@@ -60,7 +60,6 @@
  * <p/>
  * A port has an administrative state which is either 'DOWN' or 'ACTIVE'. Ports which are administratively down will not be able to receive/send traffic.
 
- * @author Nick Livens
  * @see <a href=
  *      "http://docs.openstack.org/api/openstack-network/2.0/content/Ports.html">api doc</a>
  */
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java
index 4d02d69..0c38050 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApi.java
@@ -56,7 +56,6 @@
  * Provides synchronous access to Subnet operations on the Openstack Neutron API.
  *
 
- * @author Nick Livens
  * @see <a href=
  *      "http://docs.openstack.org/api/openstack-network/2.0/content/Subnets.html">api doc</a>
  */
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java
index ffc3df2..d0a43d4 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java
@@ -38,9 +38,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 @Beta
 @Singleton
 public class ParseNetworkDetails extends ParseJson<Networks> {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java
index 35d0f1c..9a22848 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java
@@ -38,9 +38,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 @Beta
 @Singleton
 public class ParseNetworks extends ParseJson<Networks> {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java
index e0c53ed..3a0359b 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java
@@ -39,9 +39,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 @Beta
 @Singleton
 public class ParsePortDetails extends ParseJson<Ports> {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java
index 9295df9..73ae114 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java
@@ -38,9 +38,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 @Beta
 @Singleton
 public class ParsePorts extends ParseJson<Ports> {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java
index be8e227..88fbf2e 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java
@@ -39,9 +39,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker;
 
-/**
- * @author Nick Livens
- */
 @Beta
 @Singleton
 public class ParseRouterDetails extends ParseJson<Routers> {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java
index f1e70b1..a9842ab 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java
@@ -39,9 +39,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker;
 
-/**
- * @author Nick Livens
- */
 @Beta
 @Singleton
 public class ParseRouters extends ParseJson<Routers> {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java
index 4ef5928..0f63aec 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java
@@ -38,9 +38,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 @Beta
 @Singleton
 public class ParseSubnetDetails extends ParseJson<Subnets> {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java
index ba7b731..4191d8b 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java
@@ -38,9 +38,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 @Beta
 @Singleton
 public class ParseSubnets extends ParseJson<Subnets> {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/handlers/NeutronErrorHandler.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/handlers/NeutronErrorHandler.java
index 97dbb35..87c28c5 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/handlers/NeutronErrorHandler.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/handlers/NeutronErrorHandler.java
@@ -29,9 +29,6 @@
 
 /**
  * This will parse and set an appropriate exception on the command object.
- *
- * @author Nick Livens
- *
  */
 @Singleton
 public class NeutronErrorHandler implements HttpErrorHandler {
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateNetworkBulkOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateNetworkBulkOptions.java
index bc742e4..7410839 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateNetworkBulkOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateNetworkBulkOptions.java
@@ -34,9 +34,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.jclouds.openstack.neutron.v2_0.options.CreateNetworkOptions.CreateNetworkRequest;
 
-/**
- * @author Nick Livens
- */
 public class CreateNetworkBulkOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateNetworkOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateNetworkOptions.java
index 73350e5..f4237f5 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateNetworkOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateNetworkOptions.java
@@ -29,9 +29,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 public class CreateNetworkOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreatePortBulkOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreatePortBulkOptions.java
index 58dc8fe..bbe473d 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreatePortBulkOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreatePortBulkOptions.java
@@ -34,9 +34,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 public class CreatePortBulkOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreatePortOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreatePortOptions.java
index 335b1f1..1903da2 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreatePortOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreatePortOptions.java
@@ -31,9 +31,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 public class CreatePortOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateRouterOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateRouterOptions.java
index 8ec4671..7834953 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateRouterOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateRouterOptions.java
@@ -26,9 +26,6 @@
 import javax.inject.Inject;
 import java.util.Map;
 
-/**
- * @author Nick Livens
- */
 public class CreateRouterOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateSubnetBulkOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateSubnetBulkOptions.java
index 4f9784e..ae85ad1 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateSubnetBulkOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateSubnetBulkOptions.java
@@ -34,9 +34,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 public class CreateSubnetBulkOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateSubnetOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateSubnetOptions.java
index e9c67c7..c562e06 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateSubnetOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/CreateSubnetOptions.java
@@ -33,9 +33,6 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-/**
- * @author Nick Livens
- */
 public class CreateSubnetOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/EmptyOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/EmptyOptions.java
index 4299b2c..b5a3d9d 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/EmptyOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/EmptyOptions.java
@@ -26,8 +26,6 @@
 
 /**
  * This class is used for methods who don't need a wrapper around their JSON body
- *
- * @author Nick Livens
  */
 public class EmptyOptions implements MapBinder {
 
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateNetworkOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateNetworkOptions.java
index 9ec46a5..e794acf 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateNetworkOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateNetworkOptions.java
@@ -25,9 +25,6 @@
 import javax.inject.Inject;
 import java.util.Map;
 
-/**
- * @author Nick Livens
- */
 public class UpdateNetworkOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdatePortOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdatePortOptions.java
index 02d5eec..dfbc820 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdatePortOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdatePortOptions.java
@@ -30,9 +30,6 @@
 import java.util.Map;
 import java.util.Set;
 
-/**
- * @author Nick Livens
- */
 public class UpdatePortOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateRouterOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateRouterOptions.java
index cb91d46..c614e91 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateRouterOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateRouterOptions.java
@@ -26,9 +26,6 @@
 import javax.inject.Inject;
 import java.util.Map;
 
-/**
- * @author Nick Livens
- */
 public class UpdateRouterOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateSubnetOptions.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateSubnetOptions.java
index df7be18..3f2ec26 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateSubnetOptions.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/options/UpdateSubnetOptions.java
@@ -30,9 +30,6 @@
 import java.util.Map;
 import java.util.Set;
 
-/**
- * @author Nick Livens
- */
 public class UpdateSubnetOptions implements MapBinder {
 
    @Inject
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadataTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadataTest.java
index 8920b33..db3019c 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadataTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadataTest.java
@@ -23,9 +23,6 @@
 import org.jclouds.apis.internal.BaseApiMetadataTest;
 import org.testng.annotations.Test;
 
-/**
- * @author Nick Livens
- */
 @Test(groups = "unit", testName = "NeutronApiMetadataTest")
 public class NeutronApiMetadataTest extends BaseApiMetadataTest {
    public NeutronApiMetadataTest() {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java
index 8583428..222ca1a 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java
@@ -42,8 +42,6 @@
 
 /**
  * Tests parsing and Guice wiring of RouterApi
- *
- * @author Nick Livens
  */
 @Test(groups = "unit", testName = "RouterApiExpectTest")
 public class RouterApiExpectTest extends BaseNeutronApiExpectTest {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java
index bc4f69a..d38b805 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java
@@ -42,8 +42,6 @@
 
 /**
  * Tests parsing and Guice wiring of RouterApi
- *
- * @author Nick Livens
  */
 @Test(groups = "live", testName = "RouterApiLiveTest")
 public class RouterApiLiveTest extends BaseNeutronApiLiveTest {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java
index 3e16b52..40d676d 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java
@@ -42,8 +42,6 @@
 
 /**
  * Tests parsing and Guice wiring of NetworkApi
- *
- * @author Nick Livens
  */
 @Test(groups = "unit", testName = "NetworkApiExpectTest")
 public class NetworkApiExpectTest extends BaseNeutronApiExpectTest {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
index 6950a89..e123c2e 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
@@ -38,8 +38,6 @@
 
 /**
  * Tests parsing and Guice wiring of NetworkApi
- *
- * @author Nick Livens
  */
 @Test(groups = "live", testName = "NetworkApiLiveTest")
 public class NetworkApiLiveTest extends BaseNeutronApiLiveTest {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java
index 47a7af3..2231e81 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java
@@ -41,8 +41,6 @@
 
 /**
  * Tests parsing and Guice wiring of PortApi
- *
- * @author Nick Livens
  */
 @Test(groups = "unit", testName = "PortApiExpectTest")
 public class PortApiExpectTest extends BaseNeutronApiExpectTest {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
index 1a368b3..6a5d4a6 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
@@ -43,8 +43,6 @@
 
 /**
  * Tests PortApi in combination with the Network & SubnetApi
- *
- * @author Nick Livens
  */
 @Test(groups = "live", testName = "PortApiLiveTest")
 public class PortApiLiveTest extends BaseNeutronApiLiveTest {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
index 581e6a1..0cab1dd 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
@@ -40,8 +40,6 @@
 
 /**
  * Tests parsing and Guice wiring of SubnetApi
- *
- * @author Nick Livens
  */
 @Test(groups = "unit", testName = "SubnetApiExpectTest")
 public class SubnetApiExpectTest extends BaseNeutronApiExpectTest {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
index bd3574f..3bde9a1 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
@@ -43,8 +43,6 @@
 
 /**
  * Tests subnet api in combination with the network api
- *
- * @author Nick Livens
  */
 @Test(groups = "live", testName = "SubnetApiLiveTest")
 public class SubnetApiLiveTest extends BaseNeutronApiLiveTest {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronApiExpectTest.java
index f63a30a..ff9ffa7 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronApiExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronApiExpectTest.java
@@ -26,8 +26,6 @@
 
 /**
  * Base class for writing Neutron Rest Api Expect tests
- *
- * @author Nick Livens
  */
 public class BaseNeutronApiExpectTest extends BaseNeutronExpectTest<NeutronApi> {
 
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronApiLiveTest.java
index 5ff29f1..9c57b82 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronApiLiveTest.java
@@ -26,8 +26,6 @@
 
 /**
  * Tests behavior of {@code NeutronApi}
- *
- * @author Nick Livens
  */
 @Test(groups = "live")
 public class BaseNeutronApiLiveTest extends BaseApiLiveTest<NeutronApi> {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronExpectTest.java
index 21f4248..3849abd 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/internal/BaseNeutronExpectTest.java
@@ -26,8 +26,6 @@
 
 /**
  * Base class for writing Neutron Expect tests
- *
- * @author Nick Livens
  */
 public class BaseNeutronExpectTest<T> extends BaseRestApiExpectTest<T> {
    protected HttpRequest keystoneAuthWithUsernameAndPassword;
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseNetworkTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseNetworkTest.java
index ea26fcb..9509ba3 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseNetworkTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseNetworkTest.java
@@ -27,9 +27,6 @@
 import javax.ws.rs.Consumes;
 import javax.ws.rs.core.MediaType;
 
-/**
- * @author Nick Livens
- */
 @Test(groups = "unit", testName = "ParseNetworkTest")
 public class ParseNetworkTest extends BaseItemParserTest<Network> {
 
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParsePortTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParsePortTest.java
index 7e0669e..b029299 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParsePortTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParsePortTest.java
@@ -26,9 +26,6 @@
 import javax.ws.rs.Consumes;
 import javax.ws.rs.core.MediaType;
 
-/**
- * @author Nick Livens
- */
 @Test(groups = "unit", testName = "ParsePortTest")
 public class ParsePortTest extends BaseItemParserTest<Port> {
 
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseRouterTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseRouterTest.java
index 868d3c6..1787129 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseRouterTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseRouterTest.java
@@ -27,9 +27,6 @@
 import javax.ws.rs.Consumes;
 import javax.ws.rs.core.MediaType;
 
-/**
- * @author Nick Livens
- */
 @Test(groups = "unit", testName = "ParseRouterTest")
 public class ParseRouterTest extends BaseItemParserTest<Router> {
 
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseSubnetTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseSubnetTest.java
index 586da5f..afe84b4 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseSubnetTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/parse/ParseSubnetTest.java
@@ -25,9 +25,6 @@
 import javax.ws.rs.Consumes;
 import javax.ws.rs.core.MediaType;
 
-/**
- * @author Nick Livens
- */
 @Test(groups = "unit", testName = "ParseSubnetTest")
 public class ParseSubnetTest extends BaseItemParserTest<Subnet> {
 
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/util/ClassUtil.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/util/ClassUtil.java
index f3030a7..1797fb3 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/util/ClassUtil.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/util/ClassUtil.java
@@ -19,9 +19,6 @@
 
 import java.lang.reflect.Field;
 
-/**
- * @author Nick Livens
- */
 public class ClassUtil {
 
     public static Field findField(Class clazz, String fieldName) {
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/util/PredicateUtil.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/util/PredicateUtil.java
index 628d9b8..95ede8f 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/util/PredicateUtil.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/util/PredicateUtil.java
@@ -22,9 +22,6 @@
 
 import java.lang.reflect.Field;
 
-/**
- * @author Nick Livens
- */
 public class PredicateUtil {
 
     public static <T> Predicate<T> createIdEqualsPredicate(final String id) {
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java
index 5d4dad6..9a1925a 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/CopyObjectException.java
@@ -21,8 +21,6 @@
 /**
  * Thrown when an object cannot be copied.
  *  
- * @author Everett Toews
- * @author Jeremy Daggett
  * 
  * @see {@link SwiftErrorHandler#handleError(HttpCommand, HttpResponse)}
  */
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
index 20cda73..6d8b2a7 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
@@ -45,7 +45,6 @@
  * This API is new to jclouds and hence is in Beta. That means we need people to use it and give us feedback. Based
  * on that feedback, minor changes to the interfaces may happen. This code will replace
  * {@code org.jclouds.openstack.swift.SwiftClient} in jclouds 2.0 and it is recommended you adopt it sooner than later.
- *
  */
 @Beta
 public interface SwiftApi extends Closeable {
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
index 68fad92..9f110f4 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApiMetadata.java
@@ -40,10 +40,6 @@
 
 /**
  * Implementation of {@link ApiMetadata} for the Swift API.
- * 
- * @author Adrian Cole
- * @author Zack Shoylev
- * @author Jeremy Daggett
  */
 public class SwiftApiMetadata extends BaseHttpApiMetadata<SwiftApi> {
    
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java
index f979c2d..375f89a 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java
@@ -36,8 +36,6 @@
 /**
  * Represents an object in OpenStack Object Storage.
  * 
- * @author Adrian Cole
- * @author Jeremy Daggett
  * 
  * @see ObjectApi
  */
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
index cb83d5d..21582a1 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/AccountApi.java
@@ -52,7 +52,6 @@
  * on that feedback, minor changes to the interfaces may happen. This code will replace
  * org.jclouds.openstack.swift.SwiftClient in jclouds 2.0 and it is recommended you adopt it sooner than later.
  * 
- * @author Jeremy Daggett
  * 
  * @see {@link Account}
  */
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java
index 51177eb..002ca3b 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/BulkApi.java
@@ -50,7 +50,6 @@
  * This API is new to jclouds and hence is in Beta. That means we need people to use it and give us feedback. Based
  * on that feedback, minor changes to the interfaces may happen. This code will replace
  * org.jclouds.openstack.swift.SwiftClient in jclouds 2.0 and it is recommended you adopt it sooner than later.
- *
  */
 @Beta
 @RequestFilters(AuthenticateRequest.class)
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
index 35f3e62..11ce7d7 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java
@@ -58,7 +58,6 @@
  * This API is new to jclouds and hence is in Beta. That means we need people to use it and give us feedback. Based
  * on that feedback, minor changes to the interfaces may happen. This code will replace
  * {@code org.jclouds.openstack.swift.SwiftClient} in jclouds 2.0 and it is recommended you adopt it sooner than later.
- *
  */
 @Beta
 @RequestFilters(AuthenticateRequest.class)
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java
index fe6f0e8..385428e 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApi.java
@@ -48,9 +48,6 @@
  * This API is new to jclouds and hence is in Beta. That means we need people to use it and give us feedback. Based
  * on that feedback, minor changes to the interfaces may happen. This code will replace
  * org.jclouds.openstack.swift.SwiftClient in jclouds 2.0 and it is recommended you adopt it sooner than later.
- *
- * @author Adrian Cole
- * @author Jeremy Daggett
  */
 @Beta
 @RequestFilters(AuthenticateRequest.class)
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java
index c5ead27..bd889ec 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/reference/SwiftHeaders.java
@@ -18,8 +18,6 @@
 
 /**
  * Common headers in Swift.
- * 
- * @author Jeremy Daggett
  */
 public interface SwiftHeaders {
 
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java
index 9999ae4..d80eea3 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java
@@ -32,8 +32,6 @@
 
 /**
  * @see KeystoneProperties#CREDENTIAL_TYPE
- * 
- * @author Adrian Cole
  */
 @Test
 public class AuthenticationMockTest extends BaseOpenStackMockTest<SwiftApi> {
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftApiMetadataTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftApiMetadataTest.java
index 99c8cd6..6fbe4d9 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftApiMetadataTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/SwiftApiMetadataTest.java
@@ -23,9 +23,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.reflect.TypeToken;
 
-/**
- * @author Adrian Cole
- */
 @Test(groups = "unit", testName = "SwiftApiMetadataTest")
 // public class SwiftApiMetadataTest extends BaseBlobStoreApiMetadataTest {
 public class SwiftApiMetadataTest extends BaseApiMetadataTest {
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java
index 45abf70..3e57527 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java
@@ -38,9 +38,6 @@
 import com.squareup.okhttp.mockwebserver.MockWebServer;
 import com.squareup.okhttp.mockwebserver.RecordedRequest;
 
-/**
- * @author Jeremy Daggett
- */
 @Test(groups = "unit", testName = "AccountApiMockTest")
 public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> {
 
diff --git a/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java b/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
index c042c05..ebf3b39 100644
--- a/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
+++ b/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
@@ -41,8 +41,6 @@
 
 /**
  * Implementation of {@link ProviderMetadata} for Rackspace Autoscale API
- * 
- * @author Zack Shoylev
  */
 public class AutoscaleUSProviderMetadata extends BaseProviderMetadata {
 
diff --git a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadataExpectTest.java b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadataExpectTest.java
index f119e99..c4399e4 100644
--- a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadataExpectTest.java
+++ b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadataExpectTest.java
@@ -28,8 +28,6 @@
 
 /**
  * This test ensures that the wiring in {@link AutoscaleUSProviderMetadata} is correct.
- * 
- * @author Zack Shoylev
  */
 @Test(groups = "unit", testName = "AutoscaleUSProviderMetadataExpectTest")
 public class AutoscaleUSProviderMetadataExpectTest extends BaseAutoscaleApiExpectTest {
diff --git a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderTest.java b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderTest.java
index 2d2ca2c..f048149 100644
--- a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderTest.java
+++ b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderTest.java
@@ -20,9 +20,6 @@
 import org.jclouds.rackspace.autoscale.v1.AutoscaleApiMetadata;
 import org.testng.annotations.Test;
 
-/**
- * @author Zack Shoylev
- */
 @Test(groups = "unit", testName = "AutoscaleUSProviderTest")
 public class AutoscaleUSProviderTest extends BaseProviderMetadataTest {
 
diff --git a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSGroupApiLiveTest.java b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSGroupApiLiveTest.java
index 017a84a..0173798 100644
--- a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSGroupApiLiveTest.java
+++ b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSGroupApiLiveTest.java
@@ -21,8 +21,6 @@
 
 /**
  * Tests GroupApi - live
- *
- * @author Zack Shoylev
  */
 @Test(groups = "live", testName = "AutoscaleUSGroupApiLiveTest", singleThreaded = true)
 public class AutoscaleUSGroupApiLiveTest extends GroupApiLiveTest {
diff --git a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSScalingPolicyApiLiveTest.java b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSScalingPolicyApiLiveTest.java
index 6c737fc..301c92c 100644
--- a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSScalingPolicyApiLiveTest.java
+++ b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSScalingPolicyApiLiveTest.java
@@ -21,8 +21,6 @@
 
 /**
  * Tests Scaling Policy Api - live
- *
- * @author Zack Shoylev
  */
 @Test(groups = "live", testName = "AutoscaleUSScalingPolicyApiLiveTest", singleThreaded = true)
 public class AutoscaleUSScalingPolicyApiLiveTest extends ScalingPolicyApiLiveTest {
diff --git a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSWebhookApiLiveTest.java b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSWebhookApiLiveTest.java
index 2a76398..410f06e 100644
--- a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSWebhookApiLiveTest.java
+++ b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/features/AutoscaleUSWebhookApiLiveTest.java
@@ -21,8 +21,6 @@
 
 /**
  * Tests WebhookApi - live
- *
- * @author Zack Shoylev
  */
 @Test(groups = "live", testName = "AutoscaleUSWebhookApiLiveTest", singleThreaded = true)
 public class AutoscaleUSWebhookApiLiveTest extends WebhookApiLiveTest {
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java
index 58ab926..7fd8fd6 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java
@@ -40,7 +40,6 @@
  *  
  * @see <a href="https://rackspace-autoscale.readthedocs.org">API Doc</a>
  * @see <a href="http://docs.autoscale.apiary.io/">Apiary API Doc</a>
- * @author Zack Shoylev
  */
 public interface AutoscaleApi extends Closeable{
    /**
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApiMetadata.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApiMetadata.java
index 4dc4c63..6ae4388 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApiMetadata.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApiMetadata.java
@@ -38,7 +38,6 @@
  * Implementation of {@link ApiMetadata} for the Rackspace Autoscale API
  * 
  * @see AutoscaleApi
- * @author Zack Shoylev
  */
 public class AutoscaleApiMetadata extends BaseHttpApiMetadata<AutoscaleApi> {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindCreateGroupToJson.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindCreateGroupToJson.java
index 1a51d39..1a0f8b9 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindCreateGroupToJson.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindCreateGroupToJson.java
@@ -30,7 +30,6 @@
 
 /**
  * Decouple building the json object from the domain objects structure by using the binder
- * @author Zack Shoylev
  */
 public class BindCreateGroupToJson implements MapBinder {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindLaunchConfigurationToJson.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindLaunchConfigurationToJson.java
index 86be582..7249a87 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindLaunchConfigurationToJson.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindLaunchConfigurationToJson.java
@@ -27,7 +27,6 @@
 
 /**
  * Decouple building the json object from the domain objects structure by using the binder
- * @author Zack Shoylev
  */
 public class BindLaunchConfigurationToJson implements MapBinder {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindScalingPoliciesToJson.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindScalingPoliciesToJson.java
index 4ba1308..854cbeb 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindScalingPoliciesToJson.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindScalingPoliciesToJson.java
@@ -27,7 +27,6 @@
 
 /**
  * Decouple building the json object from the domain objects structure by using the binder
- * @author Zack Shoylev
  */
 public class BindScalingPoliciesToJson implements MapBinder {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindScalingPolicyToJson.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindScalingPolicyToJson.java
index 2a598c1..f794e8f 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindScalingPolicyToJson.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindScalingPolicyToJson.java
@@ -28,7 +28,6 @@
 
 /**
  * Decouple building the json object from the domain objects structure by using the binder
- * @author Zack Shoylev
  */
 public class BindScalingPolicyToJson implements MapBinder {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindToGroupConfigurationRequestPayload.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindToGroupConfigurationRequestPayload.java
index af0ddf6..c320a19 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindToGroupConfigurationRequestPayload.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindToGroupConfigurationRequestPayload.java
@@ -29,10 +29,6 @@
 
 import com.google.common.collect.Maps;
 
-/**
- * 
- * @author Zack Shoylev
- */
 public class BindToGroupConfigurationRequestPayload implements MapBinder {
 
    protected final Json jsonBinder;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhookToJson.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhookToJson.java
index 23b46ab..b471eb5 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhookToJson.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhookToJson.java
@@ -28,7 +28,6 @@
 
 /**
  * Bind parameters to a webhook
- * @author Zack Shoylev
  */
 public class BindWebhookToJson implements MapBinder {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhookUpdateToJson.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhookUpdateToJson.java
index a522a70..be2d287 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhookUpdateToJson.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhookUpdateToJson.java
@@ -27,7 +27,6 @@
 
 /**
  * Bind parameters to a webhook
- * @author Zack Shoylev
  */
 public class BindWebhookUpdateToJson implements MapBinder {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhooksToJson.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhooksToJson.java
index 2dfd436..a3effd8 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhooksToJson.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/binders/BindWebhooksToJson.java
@@ -30,7 +30,6 @@
 
 /**
  * Bind parameters to a webhook
- * @author Zack Shoylev
  */
 public class BindWebhooksToJson implements MapBinder {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/config/AutoscaleHttpApiModule.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/config/AutoscaleHttpApiModule.java
index 1be469f..7c32ce8 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/config/AutoscaleHttpApiModule.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/config/AutoscaleHttpApiModule.java
@@ -41,8 +41,6 @@
 
 /**
  * Configures the Autoscale connection.
- * 
- * @author Zack Shoylev
  */
 @ConfiguresHttpApi
 public class AutoscaleHttpApiModule extends HttpApiModule<AutoscaleApi> {
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/config/AutoscaleParserModule.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/config/AutoscaleParserModule.java
index 580ff2a..9b8a280 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/config/AutoscaleParserModule.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/config/AutoscaleParserModule.java
@@ -21,9 +21,6 @@
 
 import com.google.inject.AbstractModule;
 
-/**
- * @author Zack Shoylev
- */
 public class AutoscaleParserModule extends AbstractModule {
    @Override
    protected void configure() {
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java
index bc2f06d..6160378 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateScalingPolicy.java
@@ -35,7 +35,6 @@
  * @see GroupApi#create(GroupConfiguration, LaunchConfiguration, java.util.List)
  * @see Group#getScalingPolicies()
  * @see ScalingPolicy
- * @author Zack Shoylev
  */
 public class CreateScalingPolicy implements Comparable<CreateScalingPolicy> {
    private final String name;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateWebhook.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateWebhook.java
index 4e6ae12..2f63867 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateWebhook.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/CreateWebhook.java
@@ -32,7 +32,6 @@
  * 
  * @see Group
  * @see CreateScalingPolicy
- * @author Zack Shoylev
  */
 public class CreateWebhook {
    private final String name;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Group.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Group.java
index b079a91..27b1619 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Group.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Group.java
@@ -27,8 +27,6 @@
 /**
  * Autoscale Group.
  * This domain object contains information about an autoscaling group.
- * 
- * @author Zack Shoylev
  */
 
 public class Group {
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupConfiguration.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupConfiguration.java
index e8bbe8d..f6b7876 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupConfiguration.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupConfiguration.java
@@ -31,7 +31,6 @@
  * Autoscale GroupConfiguration.
  * 
  * @see GroupApi#create(GroupConfiguration, LaunchConfiguration, java.util.List)
- * @author Zack Shoylev
  */
 public class GroupConfiguration implements Comparable<GroupConfiguration>{
    private final String name;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupInstance.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupInstance.java
index 70d265a..4cda920 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupInstance.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupInstance.java
@@ -30,7 +30,6 @@
  * Autoscale Group Instance (as in hardware instance). Part of the group state.
  * 
  * @see GroupState#getGroupInstances()
- * @author Zack Shoylev
  */
 public class GroupInstance {
    private final String id;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupState.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupState.java
index 388f747..cee92c7 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupState.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/GroupState.java
@@ -32,7 +32,6 @@
  * @see Group
  * @see GroupApi#listGroupStates()
  * @see GroupApi#getState(String)
- * @author Zack Shoylev
  */
 public class GroupState implements Comparable<GroupState> {
    private final String id;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LaunchConfiguration.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LaunchConfiguration.java
index f27ae70..803d508 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LaunchConfiguration.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LaunchConfiguration.java
@@ -32,7 +32,6 @@
  * Autoscale LaunchConfiguration.
  * 
  * @see GroupApi#create(GroupConfiguration, LaunchConfiguration, List)
- * @author Zack Shoylev
  */
 public class LaunchConfiguration implements Comparable<LaunchConfiguration>{
    private final ImmutableList<LoadBalancer> loadBalancers;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LoadBalancer.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LoadBalancer.java
index eb8eaa6..3ef6641 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LoadBalancer.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/LoadBalancer.java
@@ -28,7 +28,6 @@
  * Autoscale LoadBalancer. Part of the launch configuration.
  * 
  * @see LaunchConfiguration#getLoadBalancers()
- * @author Zack Shoylev
  */
 public class LoadBalancer {
    private final int port;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Personality.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Personality.java
index 4b2400f..b1526d1 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Personality.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Personality.java
@@ -27,7 +27,6 @@
  * Autoscale Personality. Part of the launch configuration.
  * 
  * @see LaunchConfiguration#getPersonalities()
- * @author Zack Shoylev
  */
 public class Personality {
    private final String path;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java
index acbf634..e047040 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java
@@ -32,7 +32,6 @@
  * Autoscale ScalingPolicyResponse. Extends ScalingPolicy with id and links.
  * 
  * @see Group#getScalingPolicies()
- * @author Zack Shoylev
  */
 public class ScalingPolicy extends CreateScalingPolicy{
    private final ImmutableList<Link> links;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Webhook.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Webhook.java
index 07e8ab7..24760fd 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Webhook.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/Webhook.java
@@ -36,7 +36,6 @@
  * Autoscale WebhookResponse. Extends Webhook with id and links.
  * 
  * @see CreateWebhook#getWebhooks()
- * @author Zack Shoylev
  */
 public class Webhook extends CreateWebhook {
    private final ImmutableList<Link> links;
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/GroupApi.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/GroupApi.java
index 9b9cb48..d265b42 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/GroupApi.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/GroupApi.java
@@ -54,7 +54,6 @@
 /**
  * The API for controlling scaling groups.
  * A scaling group is a high-level autoscaling concept that encompasses a group configuration, a launch configuration, and a set of scaling policies.
- * @author Zack Shoylev
  */
 @RequestFilters(AuthenticateRequest.class)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/PolicyApi.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/PolicyApi.java
index 7424a72..305ac0d 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/PolicyApi.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/PolicyApi.java
@@ -51,7 +51,6 @@
 /**
  * The API for controlling the configuration of scaling groups.
  * A scaling group is a high-level autoscaling concept that encompasses a group configuration, a launch configuration, and a set of scaling policies.
- * @author Zack Shoylev
  */
 @RequestFilters(AuthenticateRequest.class)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApi.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApi.java
index bacb11a..6eb8ef1 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApi.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApi.java
@@ -49,7 +49,6 @@
 
 /**
  * The API for controlling autoscale webhooks.
- * @author Zack Shoylev
  */
 @RequestFilters(AuthenticateRequest.class)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupLaunchConfigurationResponse.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupLaunchConfigurationResponse.java
index caa8563..153af9c 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupLaunchConfigurationResponse.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupLaunchConfigurationResponse.java
@@ -34,7 +34,6 @@
 
 /**
  * This parses the group response and decouples domain objects from the json object returned by the service.
- * @author Zack Shoylev
  */
 public class ParseGroupLaunchConfigurationResponse implements Function<HttpResponse, LaunchConfiguration> {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupResponse.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupResponse.java
index db8c3dc..7726543 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupResponse.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupResponse.java
@@ -43,7 +43,6 @@
 
 /**
  * This parses the group response and decouples domain objects from the json object returned by the service.
- * @author Zack Shoylev
  */
 public class ParseGroupResponse implements Function<HttpResponse, Group> {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPoliciesResponse.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPoliciesResponse.java
index a2b7b32..7ab1a23 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPoliciesResponse.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPoliciesResponse.java
@@ -38,7 +38,6 @@
 
 /**
  * This parses the scaling policy response and decouples domain objects from the json object returned by the service.
- * @author Zack Shoylev
  */
 public class ParseScalingPoliciesResponse implements Function<HttpResponse, FluentIterable<ScalingPolicy>> {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPolicyResponse.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPolicyResponse.java
index f79e364..3e859d7 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPolicyResponse.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPolicyResponse.java
@@ -37,7 +37,6 @@
 
 /**
  * This parses the scaling policy response and decouples domain objects from the json object returned by the service.
- * @author Zack Shoylev
  */
 public class ParseScalingPolicyResponse implements Function<HttpResponse, ScalingPolicy> {
 
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/handlers/AutoscaleErrorHandler.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/handlers/AutoscaleErrorHandler.java
index 202b5de..bc40a6a 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/handlers/AutoscaleErrorHandler.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/handlers/AutoscaleErrorHandler.java
@@ -30,7 +30,6 @@
 
 /**
  * This will parse and set an appropriate exception on the command object.
- * @author Zack Shoylev
  */
 @Singleton
 public class AutoscaleErrorHandler implements HttpErrorHandler {
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/internal/ParseHelper.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/internal/ParseHelper.java
index 0e897eb..85c7b1d 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/internal/ParseHelper.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/internal/ParseHelper.java
@@ -31,7 +31,6 @@
 import static org.jclouds.rackspace.autoscale.v1.domain.CreateScalingPolicy.ScalingPolicyType;
 
 /**
- * @author Zack Shoylev
  * 
  * Helper methods for parsing autoscale JSON
  */
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/utils/AutoscaleUtils.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/utils/AutoscaleUtils.java
index 8cc15bf..011560d 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/utils/AutoscaleUtils.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/utils/AutoscaleUtils.java
@@ -24,7 +24,6 @@
 import org.jclouds.rackspace.autoscale.v1.domain.Webhook;
 
 /**
- * @author Zack Shoylev
  * 
  * This is more of an example code of how to execute the anonymous webhook call without jclouds.
  * A POST call to the Webhook capability Link executes the scaling policy that webhook belongs to.
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/GroupApiLiveTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/GroupApiLiveTest.java
index 72c0533..9476c3e 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/GroupApiLiveTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/GroupApiLiveTest.java
@@ -49,8 +49,6 @@
 
 /**
  * Group live test
- * 
- * @author Zack Shoylev
  */
 @Test(groups = "live", testName = "GroupApiLiveTest", singleThreaded = true)
 public class GroupApiLiveTest extends BaseAutoscaleApiLiveTest {
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/GroupApiMockTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/GroupApiMockTest.java
index 6c96a1a..0ef954e 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/GroupApiMockTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/GroupApiMockTest.java
@@ -49,8 +49,6 @@
 
 /**
  * Tests GroupApi Guice wiring and parsing
- *
- * @author Zack Shoylev
  */
 @Test//(groups = "unit", testName = "GroupApiMockTest")
 public class GroupApiMockTest extends BaseAutoscaleApiMockTest {
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
index f61b9db..df24f3e 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
@@ -50,8 +50,6 @@
 
 /**
  * Scaling Policy live test
- * 
- * @author Zack Shoylev
  */
 @Test(groups = "live", testName = "ScalingPolicyApiLiveTest", singleThreaded = true)
 public class ScalingPolicyApiLiveTest extends BaseAutoscaleApiLiveTest {
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java
index e177c8a..a0a4c9d 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java
@@ -41,8 +41,6 @@
 
 /**
  * Tests Scaling Policy Api Guice wiring and parsing
- *
- * @author Zack Shoylev
  */
 @Test(groups = "unit", testName = "ScalingPolicyApiMockTest")
 public class ScalingPolicyApiMockTest extends BaseAutoscaleApiMockTest {
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
index c4d9589..8498863 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
@@ -57,8 +57,6 @@
 
 /**
  * Webhook live test
- * 
- * @author Zack Shoylev
  */
 @Test(groups = "live", testName = "WebhookApiLiveTest", singleThreaded = true)
 public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiMockTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiMockTest.java
index da39ec3..4265be2 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiMockTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiMockTest.java
@@ -37,8 +37,6 @@
 
 /**
  * Tests WebhookApi Guice wiring and parsing
- *
- * @author Zack Shoylev
  */
 @Test(groups = "unit", testName = "WebhookApiMockTest")
 public class WebhookApiMockTest extends BaseAutoscaleApiMockTest {
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiExpectTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiExpectTest.java
index 4cf1527..ac890fe 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiExpectTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiExpectTest.java
@@ -20,8 +20,6 @@
 
 /**
  * Base class for writing Autoscale Expect tests
- * 
- * @author Zack Shoylev
  */
 public class BaseAutoscaleApiExpectTest extends BaseAutoscaleExpectTest<AutoscaleApi> {
 }
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiLiveTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiLiveTest.java
index 56f4ffa..4809d91 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiLiveTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiLiveTest.java
@@ -24,8 +24,6 @@
 
 /**
  * Tests behavior of AutoscaleApi
- * 
- * @author Zack Shoylev
  */
 public class BaseAutoscaleApiLiveTest extends BaseApiLiveTest<AutoscaleApi> {
 
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiMockTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiMockTest.java
index 1784c8c..50377d1 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiMockTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleApiMockTest.java
@@ -28,8 +28,6 @@
 
 /**
  * Base class for writing Autoscale Expect tests
- * 
- * @author Zack Shoylev
  */
 public class BaseAutoscaleApiMockTest extends BaseOpenStackMockTest<AutoscaleApi> {
    protected Properties overrides;
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleExpectTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleExpectTest.java
index 1168449..dec2136 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleExpectTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleExpectTest.java
@@ -24,9 +24,6 @@
 
 /**
  * Base class for writing Autoscale Expect tests
- * 
- * @author Adrian Cole
- * @author Zack Shoylev
  */
 public class BaseAutoscaleExpectTest<T> extends BaseRestApiExpectTest<T> {
    protected HttpRequest keystoneAuthWithUsernameAndPassword;
diff --git a/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java b/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java
index 3e25e1d..1c32968 100644
--- a/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java
+++ b/rackspace-cloudbigdata-us/src/main/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadata.java
@@ -41,8 +41,6 @@
 
 /**
  * Implementation of {@link ProviderMetadata} for Rackspace CloudBigData API
- * 
- * @author Zack Shoylev
  */
 public class CloudBigDataUSProviderMetadata extends BaseProviderMetadata {
 
diff --git a/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadataMockTest.java b/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadataMockTest.java
index 8d2a9d3..f7f8b2e 100644
--- a/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadataMockTest.java
+++ b/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderMetadataMockTest.java
@@ -21,8 +21,6 @@
 
 /**
  * This test ensures that the wiring in {@link CloudBigDataUSProviderMetadata} is correct.
- * 
- * @author Zack Shoylev
  */
 @Test(groups = "unit", testName = "AutoscaleUSProviderMetadataExpectTest")
 public class CloudBigDataUSProviderMetadataMockTest extends BaseCloudBigDataApiMockTest {
diff --git a/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderTest.java b/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderTest.java
index 0ca4045..b78f3df 100644
--- a/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderTest.java
+++ b/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/CloudBigDataUSProviderTest.java
@@ -20,9 +20,6 @@
 import org.jclouds.rackspace.cloudbigdata.v1.CloudBigDataApiMetadata;
 import org.testng.annotations.Test;
 
-/**
- * @author Zack Shoylev
- */
 @Test(groups = "unit", testName = "AutoscaleUSProviderTest")
 public class CloudBigDataUSProviderTest extends BaseProviderMetadataTest {
 
diff --git a/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/features/CloudBigDataUSClusterApiLiveTest.java b/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/features/CloudBigDataUSClusterApiLiveTest.java
index e41863e..a34b1e0 100644
--- a/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/features/CloudBigDataUSClusterApiLiveTest.java
+++ b/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/features/CloudBigDataUSClusterApiLiveTest.java
@@ -21,8 +21,6 @@
 
 /**
  * Tests GroupApi - live
- *
- * @author Zack Shoylev
  */
 @Test(groups = "live", testName = "AutoscaleUSGroupApiLiveTest", singleThreaded = true)
 public class CloudBigDataUSClusterApiLiveTest extends ClusterApiLiveTest {
diff --git a/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/features/CloudBigDataUSProfileApiLiveTest.java b/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/features/CloudBigDataUSProfileApiLiveTest.java
index a7a655e..7598243 100644
--- a/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/features/CloudBigDataUSProfileApiLiveTest.java
+++ b/rackspace-cloudbigdata-us/src/test/java/org/jclouds/rackspace/cloudbigdata/us/v1/features/CloudBigDataUSProfileApiLiveTest.java
@@ -21,8 +21,6 @@
 
 /**
  * Tests GroupApi - live
- *
- * @author Zack Shoylev
  */
 @Test(groups = "live", testName = "AutoscaleUSGroupApiLiveTest", singleThreaded = true)
 public class CloudBigDataUSProfileApiLiveTest extends ProfileApiLiveTest {
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java
index bded167..46aadda 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApi.java
@@ -33,7 +33,6 @@
  * Provides access to Rackspace Cloud Big Data.
  * Rackspace Cloud Big Data is an on-demand Apache Hadoop service on the Rackspace open cloud. The service supports a RESTful API and alleviates the pain associated with deploying, managing, and scaling Hadoop clusters.
  * @see <a href="http://docs.rackspace.com/cbd/api/v1.0/cbd-devguide/content/overview.html">API Doc</a>
- * @author Zack Shoylev
  */
 public interface CloudBigDataApi extends Closeable{
    /**
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java
index fc56d28..74be554 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/CloudBigDataApiMetadata.java
@@ -38,7 +38,6 @@
  * Implementation of {@link ApiMetadata} for the Rackspace Cloud Big Data API
  * 
  * @see CloudBigDataApi
- * @author Zack Shoylev
  */
 public class CloudBigDataApiMetadata extends BaseHttpApiMetadata<CloudBigDataApi> {
 
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataHttpApiModule.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataHttpApiModule.java
index 01fa3f5..011a5f4 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataHttpApiModule.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataHttpApiModule.java
@@ -41,8 +41,6 @@
 
 /**
  * Configures the Cloud Big Data connection.
- * 
- * @author Zack Shoylev
  */
 @ConfiguresHttpApi
 public class CloudBigDataHttpApiModule extends HttpApiModule<CloudBigDataApi> {
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataParserModule.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataParserModule.java
index 76e6052..75193ce 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataParserModule.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/config/CloudBigDataParserModule.java
@@ -21,9 +21,6 @@
 
 import com.google.inject.AbstractModule;
 
-/**
- * @author Zack Shoylev
- */
 public class CloudBigDataParserModule extends AbstractModule {
    @Override
    protected void configure() {
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java
index 43bcb2d..d9335b9 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Cluster.java
@@ -32,7 +32,6 @@
  * Cloud Big Data Cluster.
  * Contains information about a Cloud Big Data cluster.
  * @see ClusterApi#create
- * @author Zack Shoylev
  */
 public class Cluster extends CreateCluster {
    private final String id;
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java
index 93d5b0d..dff90b9 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateCluster.java
@@ -29,7 +29,6 @@
  * This is used to describe how to create a Cloud Big Data cluster, a collection of machines that can be used to run distributed data processing.
  * This class implements the Builder pattern.
  * @see ClusterApi#create
- * @author Zack Shoylev
  */
 public class CreateCluster implements Comparable<CreateCluster> {
    private final String name;
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java
index e380da9..de07a1f 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/CreateProfile.java
@@ -31,7 +31,6 @@
  * This class is used when creating a new Profile.
  * You must create a profile before you can manage clusters for an account.
  * @see ProfileApi#create
- * @author Zack Shoylev
  */
 public class CreateProfile implements Comparable<CreateProfile> {
    private final String username;
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java
index af63416..e7a96ab 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/Profile.java
@@ -31,7 +31,6 @@
  * A Profile must be created before Clusters can be created.
  * 
  * @see ProfileApi#create
- * @author Zack Shoylev
  */
 public class Profile extends CreateProfile {
    private final String userId;
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java
index 521148e..421881e 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/domain/ProfileSSHKey.java
@@ -26,7 +26,6 @@
 /**
  * Cloud Big Data ProfileSSHKey.
  * Used to provide a key pair for a Profile.
- * @author Zack Shoylev
  */
 public class ProfileSSHKey implements Comparable<ProfileSSHKey> {
    private String name;
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java
index b42e5b0..2e9a061 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApi.java
@@ -44,7 +44,6 @@
 /**
  * The API for controlling clusters.
  * A cluster is a group of servers (nodes). In Cloud Big Data, the servers are virtual.
- * @author Zack Shoylev
  */
 @RequestFilters(AuthenticateRequest.class)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java
index a8d431c..e0126d5 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApi.java
@@ -41,7 +41,6 @@
  * A profile is the configuration for the administration and login account for the cluster.
  * Only one profile is allowed for each user or account.
  * Any updates or additions override the existing profile.
- * @author Zack Shoylev
  */
 @RequestFilters(AuthenticateRequest.class)
 @Consumes(MediaType.APPLICATION_JSON)
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/handlers/CloudBigDataErrorHandler.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/handlers/CloudBigDataErrorHandler.java
index 76df9fe..d6f21a9 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/handlers/CloudBigDataErrorHandler.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/handlers/CloudBigDataErrorHandler.java
@@ -30,7 +30,6 @@
 
 /**
  * This will parse and set an appropriate exception on the command object.
- * @author Zack Shoylev
  */
 @Singleton
 public class CloudBigDataErrorHandler implements HttpErrorHandler {
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/predicates/ClusterPredicates.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/predicates/ClusterPredicates.java
index 129d4db..91073a3 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/predicates/ClusterPredicates.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/predicates/ClusterPredicates.java
@@ -56,8 +56,6 @@
  * }
  * }
  * </pre>
- * 
- * @author Zack Shoylev
  */
 public class ClusterPredicates {
    /**
diff --git a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/utils/CloudBigDataUtils.java b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/utils/CloudBigDataUtils.java
index 4dcd013..5e7c79c 100644
--- a/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/utils/CloudBigDataUtils.java
+++ b/rackspace-cloudbigdata/src/main/java/org/jclouds/rackspace/cloudbigdata/v1/utils/CloudBigDataUtils.java
@@ -16,10 +16,6 @@
  */
 package org.jclouds.rackspace.cloudbigdata.v1.utils;
 
-/**
- * @author Zack Shoylev
- * 
- */
 public class CloudBigDataUtils {
    
 }
diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiLiveTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiLiveTest.java
index 4f016db..ac35477 100644
--- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiLiveTest.java
+++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiLiveTest.java
@@ -44,8 +44,6 @@
 
 /**
  * Profile live test
- * 
- * @author Zack Shoylev
  */
 @Test(groups = "live", testName = "ProfileApiLiveTest", singleThreaded = true)
 public class ClusterApiLiveTest extends BaseCloudBigDataApiLiveTest {   
diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiMockTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiMockTest.java
index e6863ae..5ea5a48 100644
--- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiMockTest.java
+++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ClusterApiMockTest.java
@@ -39,8 +39,6 @@
 
 /**
  * Tests ProfileApi Guice wiring and parsing
- *
- * @author Zack Shoylev
  */
 @Test
 public class ClusterApiMockTest extends BaseCloudBigDataApiMockTest {
diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiLiveTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiLiveTest.java
index e849903..ae5211e 100644
--- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiLiveTest.java
+++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiLiveTest.java
@@ -34,8 +34,6 @@
 
 /**
  * Profile live test
- * 
- * @author Zack Shoylev
  */
 @Test(groups = "live", testName = "ProfileApiLiveTest", singleThreaded = true)
 public class ProfileApiLiveTest extends BaseCloudBigDataApiLiveTest {   
diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiMockTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiMockTest.java
index 636d922..46a7e06 100644
--- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiMockTest.java
+++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/features/ProfileApiMockTest.java
@@ -37,8 +37,6 @@
 
 /**
  * Tests ProfileApi Guice wiring and parsing
- *
- * @author Zack Shoylev
  */
 @Test
 public class ProfileApiMockTest extends BaseCloudBigDataApiMockTest {
diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiLiveTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiLiveTest.java
index 8457d05..3145c34 100644
--- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiLiveTest.java
+++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiLiveTest.java
@@ -24,8 +24,6 @@
 
 /**
  * Tests behavior of CLoud Big Data live.
- * 
- * @author Zack Shoylev
  */
 public class BaseCloudBigDataApiLiveTest extends BaseApiLiveTest<CloudBigDataApi> {
 
diff --git a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java
index b2b3fa4..792b89c 100644
--- a/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java
+++ b/rackspace-cloudbigdata/src/test/java/org/jclouds/rackspace/cloudbigdata/v1/internal/BaseCloudBigDataApiMockTest.java
@@ -28,8 +28,6 @@
 
 /**
  * Base class for writing Cloud Big Data Expect tests
- * 
- * @author Zack Shoylev
  */
 public class BaseCloudBigDataApiMockTest extends BaseOpenStackMockTest<CloudBigDataApi> {
    protected Properties overrides;
diff --git a/rackspace-cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderMetadata.java b/rackspace-cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderMetadata.java
index a16cf72..1a2f460 100644
--- a/rackspace-cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderMetadata.java
+++ b/rackspace-cloudfiles-uk/src/main/java/org/jclouds/rackspace/cloudfiles/uk/CloudFilesUKProviderMetadata.java
@@ -43,10 +43,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Module;
 
-/**
- * 
- * @author Jeremy Daggett
- */
 public class CloudFilesUKProviderMetadata extends BaseProviderMetadata {
    
    public static Builder builder() {
diff --git a/rackspace-cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderMetadata.java b/rackspace-cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderMetadata.java
index beb9521..499b2e2 100644
--- a/rackspace-cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderMetadata.java
+++ b/rackspace-cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/us/CloudFilesUSProviderMetadata.java
@@ -45,8 +45,6 @@
 
 /**
  * Implementation of {@link ProviderMetadata} for Rackspace Cloud Files US regions.
- * 
- * @author Jeremy Daggett
  */
 public class CloudFilesUSProviderMetadata extends BaseProviderMetadata {
    
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadata.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadata.java
index 17baef0..186df97 100644
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadata.java
+++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadata.java
@@ -41,8 +41,6 @@
 
 /**
  * Implementation of {@link ApiMetadata} for Cloud Files.
- * 
- * @author Jeremy Daggett
  */
 public class CloudFilesApiMetadata extends BaseHttpApiMetadata<CloudFilesApi> {
 
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeaders.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeaders.java
index 792657a..a2cb5bd 100644
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeaders.java
+++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeaders.java
@@ -34,8 +34,6 @@
  * Binds a list of email addresses to request headers. 
  * 
  * @see {@link CDNApi#purgeObject(String, String, Iterable)}
- * 
- * @author Jeremy Daggett
  */
 @Singleton
 public class BindCDNPurgeEmailAddressesToHeaders implements Binder {
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
index 590bccb..d987f88 100644
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
+++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
@@ -29,8 +29,6 @@
 
 /**
  * Represents a CDN Container in Rackspace Cloud Files.
- * 
- * @author Jeremy Daggett
  */
 public class CDNContainer implements Comparable<CDNContainer> {
 
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java
index e551ab1..3d4e0f9 100644
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java
+++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerFromHeaders.java
@@ -40,9 +40,6 @@
 
 /**
  * Parses the {@link CDNContainer} from the response headers.
- * 
- * @author Jeremy Daggett
- *
  */
 public class ParseCDNContainerFromHeaders implements Function<HttpResponse, CDNContainer>,
       InvocationContext<ParseCDNContainerFromHeaders> {
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerURIFromHeaders.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerURIFromHeaders.java
index 42ed1f7..7bd3a52 100644
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerURIFromHeaders.java
+++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/ParseCDNContainerURIFromHeaders.java
@@ -27,9 +27,6 @@
 
 /**
  * Parses the {@link CDNContainer} from the response headers.
- * 
- * @author Jeremy Daggett
- *
  */
 public class ParseCDNContainerURIFromHeaders implements Function<HttpResponse, URI> {
 
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java
index 7ce64e7..866c34f 100644
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java
+++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/functions/RegionToCDNEndpoint.java
@@ -42,7 +42,6 @@
  * The Cloud Files Service Type will always default to OpenStack Object Storage ("object-storage").
  * <p/>
  * 
- * @author Jeremy Daggett
  * 
  * @see CloudFilesApi#cdnApiInRegion(String)
  * @see CDNApi
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/options/UpdateCDNContainerOptions.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/options/UpdateCDNContainerOptions.java
index 5f6d396..bdc2ada 100644
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/options/UpdateCDNContainerOptions.java
+++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/options/UpdateCDNContainerOptions.java
@@ -35,8 +35,6 @@
 
 /**
  * Options supported for updating CDN containers.
- * 
- * @author Jeremy Daggett
  */
 public class UpdateCDNContainerOptions extends BaseHttpRequestOptions {
    public static final UpdateCDNContainerOptions NONE = new UpdateCDNContainerOptions();
diff --git a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java
index c4f9983..e4d862b 100644
--- a/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java
+++ b/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/reference/CloudFilesHeaders.java
@@ -20,7 +20,6 @@
 
 /**
  * Additional headers specified by Rackspace Cloud Files.
- * 
  */
 public interface CloudFilesHeaders extends SwiftHeaders {
    // Access logs
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiLiveTest.java
index 41f675b..4a1ce4a 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiLiveTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiLiveTest.java
@@ -21,8 +21,6 @@
 
 /**
  * Tests live behavior of {@code CloudFilesApi}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "live", testName = "CloudFilesApiLiveTest")
 public class CloudFilesApiLiveTest extends BaseCloudFilesApiLiveTest {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadataTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadataTest.java
index e52bb0f..8584ca4 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadataTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/CloudFilesApiMetadataTest.java
@@ -25,8 +25,6 @@
 
 /**
  * Tests the behavior of {@link CloudFilesApiMetadata}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "unit", testName = "CloudFilesApiMetadataTest")
 public class CloudFilesApiMetadataTest extends BaseApiMetadataTest {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeadersMockTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeadersMockTest.java
index 06b2dee..7c4c4de 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeadersMockTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/binders/BindCDNPurgeEmailAddressesToHeadersMockTest.java
@@ -30,8 +30,6 @@
 
 /**
  * Tests the behavior of {@code BindCDNPurgeEmailAddressesToHeaders}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "unit", testName = "BindCDNPurgeEmailAddressesToHeadersMockTest")
 public class BindCDNPurgeEmailAddressesToHeadersMockTest extends BaseOpenStackMockTest<CloudFilesApi> {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/blobstore/CloudFilesRegionScopedBlobStoreContextLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/blobstore/CloudFilesRegionScopedBlobStoreContextLiveTest.java
index 7d6f0f3..89d1499 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/blobstore/CloudFilesRegionScopedBlobStoreContextLiveTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/blobstore/CloudFilesRegionScopedBlobStoreContextLiveTest.java
@@ -25,8 +25,6 @@
 
 /**
  * Tests the live behavior of the {@link RegionScopedBlobStoreContext}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "live")
 public class CloudFilesRegionScopedBlobStoreContextLiveTest extends RegionScopedBlobStoreContextLiveTest {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java
index f1431d9..8e57cf5 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesAccountApiLiveTest.java
@@ -27,8 +27,6 @@
 /**
  * Tests the live behavior of the OpenStack Object Storage {@link AccountApi}
  * via the {@link CloudFilesApi}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "live", testName = "CloudFilesAccountApiLiveTest")
 public class CloudFilesAccountApiLiveTest extends AccountApiLiveTest {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesBulkApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesBulkApiLiveTest.java
index b4a60b4..ba6c8b4 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesBulkApiLiveTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesBulkApiLiveTest.java
@@ -22,8 +22,6 @@
 /**
  * Tests the live behavior of the OpenStack Object Storage {@link BulkApi}
  * via the {@link CloudFilesApi}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "live", testName = "CloudFilesBulkApiLiveTest")
 public class CloudFilesBulkApiLiveTest extends BulkApiLiveTest {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
index 3c68bee..39e95cc 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiLiveTest.java
@@ -42,8 +42,6 @@
 
 /**
  * Tests the live behavior of the {@code CloudFilesCDNApi}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "live", testName = "CloudFilesCDNApiLiveTest")
 public class CloudFilesCDNApiLiveTest extends BaseCloudFilesApiLiveTest {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
index cb692bb..de55058 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
@@ -48,8 +48,6 @@
 
 /**
  * Tests the behavior of the {@link CloudFilesCDNApi}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "unit", testName = "CloudFilesCDNApiMockTest")
 public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesApi> {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesContainerApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesContainerApiLiveTest.java
index e313aab..5a7f57c 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesContainerApiLiveTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesContainerApiLiveTest.java
@@ -22,8 +22,6 @@
 /**
  * Tests the live behavior of the OpenStack Object Storage {@link ContainerApi}
  * via the {@link CloudFilesApi}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "live", testName = "CloudFilesContainerApiLiveTest")
 public class CloudFilesContainerApiLiveTest extends ContainerApiLiveTest {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesObjectApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesObjectApiLiveTest.java
index f751d18..815f4c1 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesObjectApiLiveTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesObjectApiLiveTest.java
@@ -22,8 +22,6 @@
 /**
  * Tests the live behavior of the OpenStack Object Storage {@link ObjectApi}
  * via the {@link CloudFilesApi}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "live", testName = "CloudFilesObjectApiLiveTest")
 public class CloudFilesObjectApiLiveTest extends ObjectApiLiveTest {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/internal/BaseCloudFilesApiLiveTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/internal/BaseCloudFilesApiLiveTest.java
index 9392245..3df23ed 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/internal/BaseCloudFilesApiLiveTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/internal/BaseCloudFilesApiLiveTest.java
@@ -22,8 +22,6 @@
 
 /**
  * Base class for all {@link CloudFilesApi} live tests.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "live", testName = "BaseCloudFilesApiLiveTest")
 public abstract class BaseCloudFilesApiLiveTest extends BaseSwiftApiLiveTest<CloudFilesApi> {
diff --git a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/options/UpdateCDNContainerOptionsTest.java b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/options/UpdateCDNContainerOptionsTest.java
index 8d7b7e0..04c2bc0 100644
--- a/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/options/UpdateCDNContainerOptionsTest.java
+++ b/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/options/UpdateCDNContainerOptionsTest.java
@@ -34,8 +34,6 @@
 
 /**
  * Tests behavior of {@link UpdateCDNContainerOptions}.
- * 
- * @author Jeremy Daggett
  */
 @Test(groups = "unit")
 public class UpdateCDNContainerOptionsTest {
diff --git a/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java b/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java
index 392b698..cd4f446 100644
--- a/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java
+++ b/rackspace-cloudqueues-uk/src/main/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKProviderMetadata.java
@@ -40,8 +40,6 @@
 
 /**
  * Implementation of Rackspace Cloud Queues.
- * 
- * @author Everett Toews
  */
 public class CloudQueuesUKProviderMetadata extends BaseProviderMetadata {
 
diff --git a/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKClaimApiLiveTest.java b/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKClaimApiLiveTest.java
index 8908918..5c944b3 100644
--- a/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKClaimApiLiveTest.java
+++ b/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKClaimApiLiveTest.java
@@ -19,9 +19,6 @@
 import org.jclouds.openstack.marconi.v1.features.ClaimApiLiveTest;
 import org.testng.annotations.Test;
 
-/**
- * @author Everett Toews
- */
 @Test(groups = "live", testName = "CloudQueuesUKClaimApiLiveTest")
 public class CloudQueuesUKClaimApiLiveTest extends ClaimApiLiveTest {
    public CloudQueuesUKClaimApiLiveTest() {
diff --git a/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKMessageApiLiveTest.java b/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKMessageApiLiveTest.java
index f672bbe..6285fb5 100644
--- a/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKMessageApiLiveTest.java
+++ b/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKMessageApiLiveTest.java
@@ -19,9 +19,6 @@
 import org.jclouds.openstack.marconi.v1.features.MessageApiLiveTest;
 import org.testng.annotations.Test;
 
-/**
- * @author Everett Toews
- */
 @Test(groups = "live", testName = "CloudQueuesUKMessageApiLiveTest")
 public class CloudQueuesUKMessageApiLiveTest extends MessageApiLiveTest {
    public CloudQueuesUKMessageApiLiveTest() {
diff --git a/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKQueueApiLiveTest.java b/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKQueueApiLiveTest.java
index f0e8d5f..5dea8fb 100644
--- a/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKQueueApiLiveTest.java
+++ b/rackspace-cloudqueues-uk/src/test/java/org/jclouds/rackspace/cloudqueues/uk/CloudQueuesUKQueueApiLiveTest.java
@@ -19,9 +19,6 @@
 import org.jclouds.openstack.marconi.v1.features.QueueApiLiveTest;
 import org.testng.annotations.Test;
 
-/**
- * @author Everett Toews
- */
 @Test(groups = "live", testName = "CloudQueuesUKQueueApiLiveTest")
 public class CloudQueuesUKQueueApiLiveTest extends QueueApiLiveTest {
    public CloudQueuesUKQueueApiLiveTest() {
diff --git a/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java b/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java
index a7e060f..00aa0aa 100644
--- a/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java
+++ b/rackspace-cloudqueues-us/src/main/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSProviderMetadata.java
@@ -40,8 +40,6 @@
 
 /**
  * Implementation of Rackspace Cloud Queues.
- * 
- * @author Everett Toews
  */
 public class CloudQueuesUSProviderMetadata extends BaseProviderMetadata {
 
diff --git a/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSClaimApiLiveTest.java b/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSClaimApiLiveTest.java
index 9a210b4..37a791f 100644
--- a/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSClaimApiLiveTest.java
+++ b/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSClaimApiLiveTest.java
@@ -19,9 +19,6 @@
 import org.jclouds.openstack.marconi.v1.features.ClaimApiLiveTest;
 import org.testng.annotations.Test;
 
-/**
- * @author Everett Toews
- */
 @Test(groups = "live", testName = "CloudQueuesUSClaimApiLiveTest")
 public class CloudQueuesUSClaimApiLiveTest extends ClaimApiLiveTest {
     public CloudQueuesUSClaimApiLiveTest() {
diff --git a/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSMessageApiLiveTest.java b/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSMessageApiLiveTest.java
index 0652329..477ccaf 100644
--- a/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSMessageApiLiveTest.java
+++ b/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSMessageApiLiveTest.java
@@ -19,9 +19,6 @@
 import org.jclouds.openstack.marconi.v1.features.MessageApiLiveTest;
 import org.testng.annotations.Test;
 
-/**
- * @author Everett Toews
- */
 @Test(groups = "live", testName = "CloudQueuesUSMessageApiLiveTest")
 public class CloudQueuesUSMessageApiLiveTest extends MessageApiLiveTest {
     public CloudQueuesUSMessageApiLiveTest() {
diff --git a/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSQueueApiLiveTest.java b/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSQueueApiLiveTest.java
index bfedab7..872ab62 100644
--- a/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSQueueApiLiveTest.java
+++ b/rackspace-cloudqueues-us/src/test/java/org/jclouds/rackspace/cloudqueues/us/CloudQueuesUSQueueApiLiveTest.java
@@ -19,9 +19,6 @@
 import org.jclouds.openstack.marconi.v1.features.QueueApiLiveTest;
 import org.testng.annotations.Test;
 
-/**
- * @author Everett Toews
- */
 @Test(groups = "live", testName = "CloudQueuesUSQueueApiLiveTest")
 public class CloudQueuesUSQueueApiLiveTest extends QueueApiLiveTest {
     public CloudQueuesUSQueueApiLiveTest() {