diff --git a/api/src/com/cloud/exception/RequestLimitException.java b/api/src/com/cloud/exception/RequestLimitException.java
index 0142f8e8726..ebaac802649 100644
--- a/api/src/com/cloud/exception/RequestLimitException.java
+++ b/api/src/com/cloud/exception/RequestLimitException.java
@@ -21,7 +21,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
 
 /**
  * Exception thrown if number of requests is over api rate limit set.
- * @author minc
  *
  */
 public class RequestLimitException extends CloudRuntimeException {
diff --git a/api/src/org/apache/cloudstack/api/ApiErrorCode.java b/api/src/org/apache/cloudstack/api/ApiErrorCode.java
index ee28fa05878..69bd0284cef 100644
--- a/api/src/org/apache/cloudstack/api/ApiErrorCode.java
+++ b/api/src/org/apache/cloudstack/api/ApiErrorCode.java
@@ -18,7 +18,6 @@ package org.apache.cloudstack.api;
 
 /**
  * Enum class for various API error code used in CloudStack
- * @author minc
  *
  */
 public enum ApiErrorCode {
diff --git a/api/src/org/apache/cloudstack/query/QueryService.java b/api/src/org/apache/cloudstack/query/QueryService.java
index bfe7b855c81..c3f86aabb7f 100644
--- a/api/src/org/apache/cloudstack/query/QueryService.java
+++ b/api/src/org/apache/cloudstack/query/QueryService.java
@@ -58,7 +58,6 @@ import com.cloud.exception.PermissionDeniedException;
 
 /**
  * Service used for list api query.
- * @author minc
  *
  */
 public interface QueryService {
diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitService.java b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitService.java
index c5b715019b6..a135556a502 100644
--- a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitService.java
+++ b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/ApiRateLimitService.java
@@ -22,7 +22,6 @@ import com.cloud.utils.component.PluggableService;
 
 /**
  * Provide API rate limit service
- * @author minc
  *
  */
 public interface ApiRateLimitService extends PluggableService{
diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/EhcacheLimitStore.java b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/EhcacheLimitStore.java
index 659cf81b0e6..ee7c528bd07 100644
--- a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/EhcacheLimitStore.java
+++ b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/EhcacheLimitStore.java
@@ -23,7 +23,6 @@ import net.sf.ehcache.constructs.blocking.LockTimeoutException;
 
 /**
  * A Limit store implementation using Ehcache.
- * @author minc
  *
  */
 public class EhcacheLimitStore implements LimitStore {
diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/LimitStore.java b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/LimitStore.java
index a5e086b3029..373d9652ee9 100644
--- a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/LimitStore.java
+++ b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/LimitStore.java
@@ -20,7 +20,6 @@ import com.cloud.user.Account;
 
 /**
  * Interface to define how an api limit store should work.
- * @author minc
  *
  */
 public interface LimitStore {
diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntry.java b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntry.java
index 76e8a2d9281..05a7029dcb0 100644
--- a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntry.java
+++ b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntry.java
@@ -18,7 +18,6 @@ package org.apache.cloudstack.ratelimit;
 
 /**
  * Interface for each entry in LimitStore.
- * @author minc
  *
  */
 public interface StoreEntry {
diff --git a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntryImpl.java b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntryImpl.java
index e8143e52370..9f10fe68a41 100644
--- a/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntryImpl.java
+++ b/plugins/api/rate-limit/src/org/apache/cloudstack/ratelimit/StoreEntryImpl.java
@@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Implementation of limit store entry.
- * @author minc
  *
  */
 public class StoreEntryImpl implements StoreEntry {
diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/APITest.java b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/APITest.java
index 7701b1515b0..e75e852f0b7 100644
--- a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/APITest.java
+++ b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/APITest.java
@@ -37,8 +37,6 @@ import com.google.gson.Gson;
 /**
  * Base class for API Test
  *
- * @author Min Chen
- *
  */
 public abstract class APITest {
 
diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/LoginResponse.java b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/LoginResponse.java
index 719f39c0a5e..61a178033af 100644
--- a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/LoginResponse.java
+++ b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/LoginResponse.java
@@ -24,8 +24,6 @@ import com.google.gson.annotations.SerializedName;
 /**
  * Login Response object
  *
- * @author Min Chen
- *
  */
 public class LoginResponse extends BaseResponse {
 
diff --git a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java
index 72d354c6c77..f9352333d12 100644
--- a/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java
+++ b/plugins/api/rate-limit/test/org/apache/cloudstack/ratelimit/integration/RateLimitIntegrationTest.java
@@ -34,9 +34,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
 /**
  * Test fixture to do integration rate limit test.
  * Currently we commented out this test suite since it requires a real MS and Db running.
- *
- * @author Min Chen
- *
  */
 public class RateLimitIntegrationTest extends APITest {
 
diff --git a/server/src/com/cloud/api/query/ViewResponseHelper.java b/server/src/com/cloud/api/query/ViewResponseHelper.java
index 55d84bb5af4..9e612b07d1b 100644
--- a/server/src/com/cloud/api/query/ViewResponseHelper.java
+++ b/server/src/com/cloud/api/query/ViewResponseHelper.java
@@ -67,7 +67,6 @@ import com.cloud.user.UserContext;
 
 /**
  * Helper class to generate response from DB view VO objects.
- * @author minc
  *
  */
 public class ViewResponseHelper {
diff --git a/server/src/com/cloud/api/query/vo/ControlledViewEntity.java b/server/src/com/cloud/api/query/vo/ControlledViewEntity.java
index 12557504807..014abfaa3c0 100644
--- a/server/src/com/cloud/api/query/vo/ControlledViewEntity.java
+++ b/server/src/com/cloud/api/query/vo/ControlledViewEntity.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.api.InternalIdentity;
 /**
  * This is the interface for all VO classes representing DB views created for previous ControlledEntity.
  *
- * @author minc
  *
  */
 public interface ControlledViewEntity extends ControlledEntity, InternalIdentity, Identity {
diff --git a/server/src/com/cloud/api/query/vo/HostJoinVO.java b/server/src/com/cloud/api/query/vo/HostJoinVO.java
index a3796b97eba..0b8f6721325 100644
--- a/server/src/com/cloud/api/query/vo/HostJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/HostJoinVO.java
@@ -39,7 +39,6 @@ import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Host DB view.
- * @author minc
  *
  */
 @Entity
diff --git a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java b/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java
index fd837bd5d88..89e79e5eea5 100644
--- a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java
@@ -34,7 +34,6 @@ import org.apache.cloudstack.api.InternalIdentity;
 
 /**
  * Storage Pool DB view.
- * @author minc
  *
  */
 @Entity
diff --git a/server/test/com/cloud/api/APITest.java b/server/test/com/cloud/api/APITest.java
index 0b040abc3f5..63e08719f4b 100644
--- a/server/test/com/cloud/api/APITest.java
+++ b/server/test/com/cloud/api/APITest.java
@@ -36,8 +36,6 @@ import com.google.gson.Gson;
 /**
  * Base class for API Test
  *
- * @author Min Chen
- *
  */
 public abstract class APITest {
 
diff --git a/server/test/com/cloud/api/ListPerfTest.java b/server/test/com/cloud/api/ListPerfTest.java
index b8cb97eb8f0..8437ca42770 100644
--- a/server/test/com/cloud/api/ListPerfTest.java
+++ b/server/test/com/cloud/api/ListPerfTest.java
@@ -33,8 +33,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
  * Test fixture to do performance test for list command
  * Currently we commented out this test suite since it requires a real MS and Db running.
  *
- * @author Min Chen
- *
  */
 public class ListPerfTest extends APITest {
 
diff --git a/server/test/com/cloud/api/LoginResponse.java b/server/test/com/cloud/api/LoginResponse.java
index 097ae42c999..0f58374f187 100644
--- a/server/test/com/cloud/api/LoginResponse.java
+++ b/server/test/com/cloud/api/LoginResponse.java
@@ -24,8 +24,6 @@ import com.google.gson.annotations.SerializedName;
 /**
  * Login Response object
  *
- * @author Min Chen
- *
  */
 public class LoginResponse extends BaseResponse {
 
diff --git a/utils/test/com/cloud/utils/db/TransactionTest.java b/utils/test/com/cloud/utils/db/TransactionTest.java
index b952be2c28b..101a533f836 100644
--- a/utils/test/com/cloud/utils/db/TransactionTest.java
+++ b/utils/test/com/cloud/utils/db/TransactionTest.java
@@ -30,18 +30,16 @@ import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 /**
- * A test fixture to test APIs or bugs found for Transaction class. This test fixture will do one time setup before 
+ * A test fixture to test APIs or bugs found for Transaction class. This test fixture will do one time setup before
  * all its testcases to set up a test db table, and then tear down these test db artifacts after all testcases are run.
- * 
- * @author Min Chen
- * 
+ *
  */
 public class TransactionTest {
 
     @BeforeClass
     public static void oneTimeSetup() {
         Connection conn = null;
-        PreparedStatement pstmt = null; 
+        PreparedStatement pstmt = null;
         try {
             conn = Transaction.getStandaloneConnection();
 
@@ -75,7 +73,7 @@ public class TransactionTest {
      * When a transaction is set to use user-managed db connection, for each following db statement, we should see
      * that the same db connection is reused rather than acquiring a new one each time in typical transaction model.
      */
-    public void testUserManagedConnection() {        
+    public void testUserManagedConnection() {
         DbTestDao testDao = ComponentContext.inject(DbTestDao.class);
         Transaction txn = Transaction.open("SingleConnectionThread");
         Connection conn = null;
@@ -97,7 +95,7 @@ public class TransactionTest {
         } catch (SQLException e) {
             Assert.fail(e.getMessage());
         } finally {
-            txn.transitToAutoManagedConnection(Transaction.CLOUD_DB);            
+            txn.transitToAutoManagedConnection(Transaction.CLOUD_DB);
             txn.close();
 
             if (conn != null) {