diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthApi.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthApi.java
index fa82431d55..12e8fcbb92 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthApi.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthApi.java
@@ -38,7 +38,6 @@ import org.jclouds.rest.annotations.Endpoint;
  * OAuthAuthenticator as a request filter, which in turn uses this class to
  * perform token requests.
  * 
- * @author David Alves
  * @see OAuthAsyncApi
  */
 @Endpoint(Authentication.class)
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthApiMetadata.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthApiMetadata.java
index 9dd71d628d..3ef26e69c7 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthApiMetadata.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthApiMetadata.java
@@ -31,8 +31,6 @@ import com.google.inject.Module;
 
 /**
  * Implementation of {@link ApiMetadata} for OAuth 2 API
- *
- * @author David Alves
  */
 public class OAuthApiMetadata extends BaseHttpApiMetadata<OAuthApi> {
 
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthConstants.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthConstants.java
index d3953f36c3..9b140d46d9 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthConstants.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/OAuthConstants.java
@@ -22,8 +22,6 @@ import java.util.Map;
 
 /**
  * The constants for OAuth \
- *
- * @author David Alves
  */
 public final class OAuthConstants {
 
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/Authentication.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/Authentication.java
index e929edb840..4f1107a0b7 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/Authentication.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/Authentication.java
@@ -26,7 +26,6 @@ import java.lang.annotation.Target;
 /**
  * Qualifies OAuth related resources, such as Endpoint.
  *
- * @author David Alves
  * @see org.jclouds.oauth.v2.OAuthAsyncApi
  */
 @Retention(value = RetentionPolicy.RUNTIME)
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthAuthenticationModule.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthAuthenticationModule.java
index 39af1b7a82..fb2d4137cc 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthAuthenticationModule.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthAuthenticationModule.java
@@ -32,8 +32,6 @@ import com.google.inject.Provides;
 
 /**
  * An OAuth module to be used form other providers.
- * 
- * @author David Alves
  */
 public class OAuthAuthenticationModule extends AbstractModule {
 
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthHttpApiModule.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthHttpApiModule.java
index 220c5c3f75..6b4fdf959e 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthHttpApiModule.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthHttpApiModule.java
@@ -31,8 +31,6 @@ import com.google.inject.Provides;
 
 /**
  * OAuth module to when accessing OAuth stand-alone.
- * 
- * @author David Alves
  */
 @ConfiguresHttpApi
 public class OAuthHttpApiModule extends HttpApiModule<OAuthApi> {
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthModule.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthModule.java
index cc99444988..11fca2f982 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthModule.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthModule.java
@@ -48,8 +48,6 @@ import static org.jclouds.Constants.PROPERTY_SESSION_INTERVAL;
 
 /**
  * Base OAuth module
- *
- * @author David Alves
  */
 public class OAuthModule extends AbstractModule {
 
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthProperties.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthProperties.java
index fd316e8af6..7b1bf17fce 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthProperties.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthProperties.java
@@ -18,8 +18,6 @@ package org.jclouds.oauth.v2.config;
 
 /**
  * Configurable properties for jclouds OAuth
- *
- * @author David Alves
  */
 public class OAuthProperties {
 
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthScopes.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthScopes.java
index 8bb19036e3..57ffd29b4a 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthScopes.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/config/OAuthScopes.java
@@ -26,8 +26,6 @@ import java.lang.annotation.Target;
  * Used to annotate REST methods/ifaces that use OAuthAuthentication.
  * <p/>
  * Sets the scopes for the token request for that particular method.
- *
- * @author David Alves
  */
 @Retention(value = RetentionPolicy.RUNTIME)
 @Target(value = {ElementType.TYPE, ElementType.METHOD})
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java
index d64b94cc10..5c0b348d0f 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java
@@ -35,7 +35,6 @@ import static com.google.common.base.Preconditions.checkState;
 /**
  * The claimset for the token.
  *
- * @author David Alves
  * @see <a
  *      href="https://developers.google.com/accounts/docs/OAuth2ServiceAccount"
  *      >doc</a>
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java
index e6878403e3..c230e1da4c 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java
@@ -25,7 +25,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
  * The header for the OAuth token, contains the signer algorithm's name and the type of the token
  *
- * @author David Alves
  * @see <a href="https://developers.google.com/accounts/docs/OAuth2ServiceAccount">doc</a>
  */
 public class Header {
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java
index e27258f92e..a18a7eb6e3 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java
@@ -26,8 +26,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * The oauth token, obtained upon a successful token request and ready to embed in requests.
- *
- * @author David Alves
  */
 public class Token {
 
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java
index 122226137d..7d1a6a4438 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java
@@ -24,8 +24,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * A complete token request.
- *
- * @author David Alves
  */
 public class TokenRequest {
 
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequestFormat.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequestFormat.java
index 25925e4e06..f4b80c177f 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequestFormat.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequestFormat.java
@@ -24,8 +24,6 @@ import java.util.Set;
 
 /**
  * Transforms a TokenRequest into a specific format (e.g. JWT token)
- *
- * @author David Alves
  */
 @ImplementedBy(JWTTokenRequestFormat.class)
 public interface TokenRequestFormat {
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/OAuthAuthenticator.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/OAuthAuthenticator.java
index f6dec92e74..e25bc201e1 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/OAuthAuthenticator.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/filters/OAuthAuthenticator.java
@@ -34,8 +34,6 @@ import static com.google.common.base.Preconditions.checkState;
  * To be used by client applications to embed an OAuth authentication in their REST requests.
  * <p/>
  * TODO when we're able to use the OAuthAuthentication an this should be used automatically
- *
- * @author David Alves
  */
 @Singleton
 public class OAuthAuthenticator implements HttpRequestFilter {
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/BuildTokenRequest.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/BuildTokenRequest.java
index 1984028a11..7b869dcfc0 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/BuildTokenRequest.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/BuildTokenRequest.java
@@ -49,8 +49,6 @@ import com.google.inject.name.Named;
  * Builds the default token request with the following claims: iss,scope,aud,iat,exp.
  * <p/>
  * TODO scopes etc should come from the REST method and not from a global property
- *
- * @author David Alves
  */
 @Singleton
 public class BuildTokenRequest implements Function<GeneratedHttpRequest, TokenRequest> {
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/FetchToken.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/FetchToken.java
index cd3f3f5b22..593c8852ec 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/FetchToken.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/FetchToken.java
@@ -24,9 +24,6 @@ import org.jclouds.oauth.v2.domain.TokenRequest;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-/**
- * @author David Alves
- */
 @Singleton
 public class FetchToken implements Function<TokenRequest, Token> {
 
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java
index 4d57d15df0..45620c0eb9 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplier.java
@@ -51,7 +51,6 @@ import static org.jclouds.util.Throwables2.getFirstThrowableOfType;
  * Loads {@link OAuthCredentials} from a pem private key using the KeyFactory obtained from the JWT Algorithm
  * Name<->KeyFactory name mapping in OAuthConstants. The pem pk algorithm must match the KeyFactory algorithm.
  *
- * @author David Alves
  * @see org.jclouds.oauth.v2.OAuthConstants#OAUTH_ALGORITHM_NAMES_TO_KEYFACTORY_ALGORITHM_NAMES
  */
 @Singleton
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/SignOrProduceMacForToken.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/SignOrProduceMacForToken.java
index 0123d0aaa8..471812a8b1 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/SignOrProduceMacForToken.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/functions/SignOrProduceMacForToken.java
@@ -40,8 +40,6 @@ import static org.jclouds.oauth.v2.config.OAuthProperties.SIGNATURE_OR_MAC_ALGOR
 /**
  * Function that signs/produces mac's for  OAuth tokens, provided a {@link Signature} or a {@link Mac} algorithm and
  * {@link PrivateKey}
- *
- * @author David Alves
  */
 public class SignOrProduceMacForToken implements Function<byte[], byte[]> {
 
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthErrorHandler.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthErrorHandler.java
index c4793f134f..78d78440f7 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthErrorHandler.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthErrorHandler.java
@@ -30,8 +30,6 @@ import static org.jclouds.http.HttpUtils.closeClientButKeepContentStream;
 
 /**
  * This will parse and set an appropriate exception on the command object.
- *
- * @author David Alves
  */
 @Singleton
 public class OAuthErrorHandler implements HttpErrorHandler {
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthTokenBinder.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthTokenBinder.java
index cb021eb030..1030804714 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthTokenBinder.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/handlers/OAuthTokenBinder.java
@@ -27,8 +27,6 @@ import javax.inject.Singleton;
 /**
  * Generic implementation of a token binder. Uses a provided {@link TokenRequestFormat} to actually bind tokens to
  * requests.
- *
- * @author David Alves
  */
 @Singleton
 public class OAuthTokenBinder implements Binder {
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/json/ClaimSetTypeAdapter.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/json/ClaimSetTypeAdapter.java
index fd8cdb7a5d..62b3a26991 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/json/ClaimSetTypeAdapter.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/json/ClaimSetTypeAdapter.java
@@ -27,8 +27,6 @@ import java.util.Map;
 /**
  * JSON TypeAdapter for the ClaimSet type. Pull the claims maps to the root level and adds two properties for the
  * expiration time and issuing time.
- *
- * @author David Alves
  */
 public class ClaimSetTypeAdapter extends TypeAdapter<ClaimSet> {
 
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/json/JWTTokenRequestFormat.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/json/JWTTokenRequestFormat.java
index 6b514c94bc..265cb26075 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/json/JWTTokenRequestFormat.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/json/JWTTokenRequestFormat.java
@@ -44,8 +44,6 @@ import com.google.common.collect.ImmutableSet;
  * - creates the full url encoded payload as described in:
  * https://developers.google.com/accounts/docs/OAuth2ServiceAccount
  * <p/>
- *
- * @author David Alves
  */
 @Singleton
 public class JWTTokenRequestFormat implements TokenRequestFormat {
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthApiMetadataTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthApiMetadataTest.java
index 41901eb340..d6ea17f60d 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthApiMetadataTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthApiMetadataTest.java
@@ -28,8 +28,6 @@ import org.testng.annotations.Test;
  * <pre>
  * META-INF/services/org.jclouds.apis.ApiMetadata
  * </pre>
- *
- * @author Adrian Cole
  */
 @Test(groups = "unit")
 public class OAuthApiMetadataTest extends BaseApiMetadataTest {
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthTestUtils.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthTestUtils.java
index 35eb9b10f3..28879a98ce 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthTestUtils.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthTestUtils.java
@@ -29,8 +29,6 @@ import static org.jclouds.oauth.v2.config.OAuthProperties.AUDIENCE;
 
 /**
  * Utils for OAuth tests.
- *
- * @author David Alves
  */
 public class OAuthTestUtils {
 
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/features/OAuthApiExpectTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/features/OAuthApiExpectTest.java
index 48944af3c4..2008e5dddd 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/features/OAuthApiExpectTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/features/OAuthApiExpectTest.java
@@ -38,8 +38,6 @@ import org.testng.annotations.Test;
 
 /**
  * Tests that a token requess is well formed.
- *
- * @author David Alves
  */
 @Test(groups = "unit")
 public class OAuthApiExpectTest extends BaseOAuthApiExpectTest {
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/features/OAuthApiLiveTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/features/OAuthApiLiveTest.java
index b608a1dd3b..4ac59508a4 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/features/OAuthApiLiveTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/features/OAuthApiLiveTest.java
@@ -42,8 +42,6 @@ import org.testng.annotations.Test;
  * - test.jclouds.oauth.audience
  * - test.jclouds.oauth.scopes
  * - test.jclouds.oauth.signature-or-mac-algorithm
- *
- * @author David Alves
  */
 @Test(groups = "live", singleThreaded = true)
 public class OAuthApiLiveTest extends BaseOAuthApiLiveTest {
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplierTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplierTest.java
index 8ab0fe910a..2b3d094f40 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplierTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/functions/OAuthCredentialsSupplierTest.java
@@ -27,9 +27,6 @@ import java.util.Properties;
 import static org.jclouds.oauth.v2.functions.OAuthCredentialsSupplier.OAuthCredentialsForCredentials;
 import static org.testng.Assert.assertNotNull;
 
-/**
- * @author David Alves
- */
 @Test(groups = "unit")
 public class OAuthCredentialsSupplierTest {
 
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/functions/SignerFunctionTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/functions/SignerFunctionTest.java
index 797d003318..2a64822ce6 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/functions/SignerFunctionTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/functions/SignerFunctionTest.java
@@ -31,8 +31,6 @@ import org.testng.annotations.Test;
 
 /**
  * Tests the SignOrProduceMacForToken
- *
- * @author David Alves
  */
 @Test(groups = "unit")
 public class SignerFunctionTest {
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/handlers/OAuthErrorHandlerTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/handlers/OAuthErrorHandlerTest.java
index f4e65e8cf9..255c5c7f65 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/handlers/OAuthErrorHandlerTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/handlers/OAuthErrorHandlerTest.java
@@ -30,9 +30,6 @@ import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.reportMatcher;
 import static org.easymock.EasyMock.verify;
 
-/**
- * @author Adrian Cole
- */
 @Test(groups = "unit")
 public class OAuthErrorHandlerTest {
 
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/Base64UrlSafeTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/Base64UrlSafeTest.java
index c76b1affc6..f6d938a868 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/Base64UrlSafeTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/Base64UrlSafeTest.java
@@ -24,8 +24,6 @@ import org.testng.annotations.Test;
 
 /**
  * Tests that the Base64 implementations used to Base64 encode the tokens are Url safe.
- * 
- * @author David Alves
  */
 @Test(groups = "unit")
 public class Base64UrlSafeTest {
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiExpectTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiExpectTest.java
index 94d4f768dd..a44bad175d 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiExpectTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiExpectTest.java
@@ -18,9 +18,6 @@ package org.jclouds.oauth.v2.internal;
 
 import org.jclouds.oauth.v2.OAuthApi;
 
-/**
- * @author Adrian Cole
- */
 public class BaseOAuthApiExpectTest extends BaseOAuthExpectTest<OAuthApi> {
 
 }
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
index e4f483e671..ee1149002b 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthApiLiveTest.java
@@ -30,9 +30,6 @@ import org.jclouds.oauth.v2.OAuthApi;
 import org.testng.annotations.Test;
 
 
-/**
- * @author David Alves
- */
 @Test(groups = "live")
 public class BaseOAuthApiLiveTest extends BaseApiLiveTest<OAuthApi> {
 
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
index d2fbd91f70..aefdcdd934 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthAuthenticatedApiLiveTest.java
@@ -53,8 +53,6 @@ import com.google.inject.Module;
  * <p/>
  * This test asserts that a provider can authenticate with oauth for a given scope, or more simply
  * that authentication/authorization is working.
- *
- * @author David Alves
  */
 
 @Test(groups = "live")
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthExpectTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthExpectTest.java
index 1d7596cb58..18fe151ea5 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthExpectTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/internal/BaseOAuthExpectTest.java
@@ -18,9 +18,6 @@ package org.jclouds.oauth.v2.internal;
 
 import org.jclouds.rest.internal.BaseRestApiExpectTest;
 
-/**
- * @author Adrian Cole
- */
 public class BaseOAuthExpectTest<T> extends BaseRestApiExpectTest<T> {
 
    public BaseOAuthExpectTest() {
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/json/JWTTokenRequestFormatTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/json/JWTTokenRequestFormatTest.java
index 88672fe84f..fa3307fd7e 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/json/JWTTokenRequestFormatTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/json/JWTTokenRequestFormatTest.java
@@ -36,9 +36,6 @@ import org.testng.annotations.Test;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
 
-/**
- * @author David Alves
- */
 @Test(groups = "unit")
 public class JWTTokenRequestFormatTest {
    public static final String STRING_THAT_GENERATES_URL_UNSAFE_BASE64_ENCODING = "§1234567890'+±!\"#$%&/()" +
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/parse/ParseTokenTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/parse/ParseTokenTest.java
index 8d82c4d231..bcaa9e4a48 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/parse/ParseTokenTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/parse/ParseTokenTest.java
@@ -23,9 +23,6 @@ import org.testng.annotations.Test;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.core.MediaType;
 
-/**
- * @author David Alves
- */
 @Test(groups = "unit")
 public class ParseTokenTest extends BaseItemParserTest<Token> {