diff --git a/awsapi/src/com/cloud/bridge/io/FileRangeDataSource.java b/awsapi/src/com/cloud/bridge/io/FileRangeDataSource.java
index 2932ecd30c0..7e55770235d 100644
--- a/awsapi/src/com/cloud/bridge/io/FileRangeDataSource.java
+++ b/awsapi/src/com/cloud/bridge/io/FileRangeDataSource.java
@@ -25,9 +25,6 @@ import javax.activation.DataSource;
 
 import org.apache.log4j.Logger;
 
-/**
- * @author Kelven Yang
- */
 public class FileRangeDataSource implements DataSource {
     protected final static Logger logger = Logger.getLogger(FileRangeDataSource.class);
     
diff --git a/awsapi/src/com/cloud/bridge/io/FileRangeInputStream.java b/awsapi/src/com/cloud/bridge/io/FileRangeInputStream.java
index 4d3c50ee9fe..419d32631cf 100644
--- a/awsapi/src/com/cloud/bridge/io/FileRangeInputStream.java
+++ b/awsapi/src/com/cloud/bridge/io/FileRangeInputStream.java
@@ -21,9 +21,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
 
-/**
- * @author Kelven Yang
- */
 public class FileRangeInputStream extends InputStream {
 	private RandomAccessFile randomAccessFile;
 	private long curPos;
diff --git a/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
index 80c58a89965..5d50119fb62 100644
--- a/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
+++ b/awsapi/src/com/cloud/bridge/io/MTOMAwareResultStreamWriter.java
@@ -35,7 +35,6 @@ import org.apache.axis2.databinding.ADBBean;
 import org.apache.axis2.databinding.ADBException;
 
 /**
- * @author John Zucker
  * Provide an MTOM aware serializable output stream writer to be consumed by implementors of the 
  * com.amazon.s3 Response ADB bean classes.
  * This writer enables participation is StaX based builders and AXIOM om xml stream processing
diff --git a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
index d4856a560ce..7b00c677f15 100644
--- a/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
+++ b/awsapi/src/com/cloud/bridge/io/S3FileSystemBucketAdapter.java
@@ -38,9 +38,6 @@ import com.cloud.bridge.service.exception.OutOfStorageException;
 import com.cloud.bridge.util.StringHelper;
 import com.cloud.bridge.util.OrderedPair;
 
-/**
- * @author Kelven Yang, John Zucker
- */
 public class S3FileSystemBucketAdapter implements S3BucketAdapter {
     protected final static Logger logger = Logger.getLogger(S3FileSystemBucketAdapter.class);
 	
diff --git a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
index 22adfb8df5c..88c8729d902 100644
--- a/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
+++ b/awsapi/src/com/cloud/bridge/lifecycle/ServiceEngineLifecycle.java
@@ -26,7 +26,6 @@ import com.cloud.bridge.service.controller.s3.ServiceProvider;
 
 
 /**
- * @author Kelven Yang
  * ServiceEngineLifecycle is used to participate Axis service life cycle management
  * so that we can inject proper initialization and cleanup procedure into the 
  * process
diff --git a/awsapi/src/com/cloud/bridge/model/MHost.java b/awsapi/src/com/cloud/bridge/model/MHost.java
index 2832e1aa83a..2187c7ee546 100644
--- a/awsapi/src/com/cloud/bridge/model/MHost.java
+++ b/awsapi/src/com/cloud/bridge/model/MHost.java
@@ -21,9 +21,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- * @author Kelven Yang
- */
 public class MHost implements Serializable {
 	private static final long serialVersionUID = 4848254624679753930L;
 
diff --git a/awsapi/src/com/cloud/bridge/model/MHostMount.java b/awsapi/src/com/cloud/bridge/model/MHostMount.java
index d532568087f..771ed8b6aab 100644
--- a/awsapi/src/com/cloud/bridge/model/MHostMount.java
+++ b/awsapi/src/com/cloud/bridge/model/MHostMount.java
@@ -19,9 +19,6 @@ package com.cloud.bridge.model;
 import java.io.Serializable;
 import java.util.Date;
 
-/**
- * @author Kelven Yang
- */
 public class MHostMount implements Serializable {
 	private static final long serialVersionUID = -1119494563131099642L;
 
diff --git a/awsapi/src/com/cloud/bridge/model/SAcl.java b/awsapi/src/com/cloud/bridge/model/SAcl.java
index bff7906acc5..7cbcabee316 100644
--- a/awsapi/src/com/cloud/bridge/model/SAcl.java
+++ b/awsapi/src/com/cloud/bridge/model/SAcl.java
@@ -24,7 +24,6 @@ import com.cloud.bridge.util.OrderedPair;
 import com.cloud.bridge.util.Triple;
 
 /**
- * @author John Zucker, Kelven Yang
  * A model of stored ACLs to remember the ACL permissions per canonicalUserID per grantee
  * Hold the AWS S3 grantee and permission constants.
  * 
diff --git a/awsapi/src/com/cloud/bridge/model/SBucket.java b/awsapi/src/com/cloud/bridge/model/SBucket.java
index 5f63a77fe9a..720907fa529 100644
--- a/awsapi/src/com/cloud/bridge/model/SBucket.java
+++ b/awsapi/src/com/cloud/bridge/model/SBucket.java
@@ -22,7 +22,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
- * @author Kelven Yang, John Zucker
  * Holds the relation
  *  Id,
  *  Name, 
diff --git a/awsapi/src/com/cloud/bridge/model/SHost.java b/awsapi/src/com/cloud/bridge/model/SHost.java
index 874b09566d6..758cbbf0930 100644
--- a/awsapi/src/com/cloud/bridge/model/SHost.java
+++ b/awsapi/src/com/cloud/bridge/model/SHost.java
@@ -20,9 +20,6 @@ import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
-/**
- * @author Kelven Yang, John Zucker
- */
 public class SHost implements Serializable {
 	private static final long serialVersionUID = 213346565810468018L;
 	
diff --git a/awsapi/src/com/cloud/bridge/model/SMeta.java b/awsapi/src/com/cloud/bridge/model/SMeta.java
index 8962771c507..2c985710ae4 100644
--- a/awsapi/src/com/cloud/bridge/model/SMeta.java
+++ b/awsapi/src/com/cloud/bridge/model/SMeta.java
@@ -18,9 +18,6 @@ package com.cloud.bridge.model;
 
 import java.io.Serializable;
 
-/**
- * @author Kelven Yang
- */
 public class SMeta implements Serializable {
 	private static final long serialVersionUID = 7459503272337054283L;
 	
diff --git a/awsapi/src/com/cloud/bridge/model/SObject.java b/awsapi/src/com/cloud/bridge/model/SObject.java
index 73a2c9a4c64..1692b685295 100644
--- a/awsapi/src/com/cloud/bridge/model/SObject.java
+++ b/awsapi/src/com/cloud/bridge/model/SObject.java
@@ -22,9 +22,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-/**
- * @author Kelven Yang, John Zucker
- */
 public class SObject implements Serializable {
 	private static final long serialVersionUID = 8566744941395660486L;
 
diff --git a/awsapi/src/com/cloud/bridge/model/SObjectItem.java b/awsapi/src/com/cloud/bridge/model/SObjectItem.java
index 14290897cba..bbff2679109 100644
--- a/awsapi/src/com/cloud/bridge/model/SObjectItem.java
+++ b/awsapi/src/com/cloud/bridge/model/SObjectItem.java
@@ -19,9 +19,6 @@ package com.cloud.bridge.model;
 import java.io.Serializable;
 import java.util.Date;
 
-/**
- * @author Kelven Yang, John Zucker
- */
 public class SObjectItem implements Serializable {
 	private static final long serialVersionUID = -7351173256185687851L;
 
diff --git a/awsapi/src/com/cloud/bridge/persist/EntityDao.java b/awsapi/src/com/cloud/bridge/persist/EntityDao.java
index c7943a6c135..cc4a8c7d818 100644
--- a/awsapi/src/com/cloud/bridge/persist/EntityDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/EntityDao.java
@@ -25,7 +25,6 @@ import org.hibernate.Session;
 import com.cloud.bridge.util.QueryHelper;
 
 /**
- * @author Kelven Yang, John Zucker
  * Provide methods for getting, saving, deleting or updating state per session or, in a given session, returnin a List in
  * response to queryEntities for a particular instantation of the EntityDao generic class, as defined here.
  * Any instantation of EntityDao passes in the class for which it is instantiating.  For example a new instance of SBucketDao 
diff --git a/awsapi/src/com/cloud/bridge/persist/GMTDateTimeUserType.java b/awsapi/src/com/cloud/bridge/persist/GMTDateTimeUserType.java
index b39f29821a8..cf16233b680 100644
--- a/awsapi/src/com/cloud/bridge/persist/GMTDateTimeUserType.java
+++ b/awsapi/src/com/cloud/bridge/persist/GMTDateTimeUserType.java
@@ -29,7 +29,6 @@ import org.hibernate.usertype.UserType;
 import com.cloud.bridge.util.DateHelper;
 
 /**
- * @author Kelven Yang
  * GMTDateTimeUserType implements a Hibernate user type, it deals with GMT date/time conversion
  * between Java Date/Calendar and MySQL DATE types
  */
diff --git a/awsapi/src/com/cloud/bridge/persist/PersistContext.java b/awsapi/src/com/cloud/bridge/persist/PersistContext.java
index 8abc5dab6d1..8e5e0de8884 100644
--- a/awsapi/src/com/cloud/bridge/persist/PersistContext.java
+++ b/awsapi/src/com/cloud/bridge/persist/PersistContext.java
@@ -33,7 +33,6 @@ import com.cloud.bridge.util.CloudStackSessionFactory;
 import com.cloud.bridge.util.OrderedPair;
 
 /**
- * @author Kelven Yang
  * 
  * We use Per-thread based hibernate session and transaction pattern. Transaction will be
  * started implicitly by EntityDao instances and be committed implicitly in the end of
diff --git a/awsapi/src/com/cloud/bridge/persist/PersistException.java b/awsapi/src/com/cloud/bridge/persist/PersistException.java
index e2acfd2cc12..920cf40740e 100644
--- a/awsapi/src/com/cloud/bridge/persist/PersistException.java
+++ b/awsapi/src/com/cloud/bridge/persist/PersistException.java
@@ -16,9 +16,6 @@
 // under the License.
 package com.cloud.bridge.persist;
 
-/**
- * @author Kelven Yang
- */
 public class PersistException extends RuntimeException {
 	private static final long serialVersionUID = -7137918292537610367L;
 
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDao.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostDao.java
index 1c5e81c1a31..72501311003 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDao.java
@@ -19,9 +19,6 @@ package com.cloud.bridge.persist.dao;
 import com.cloud.bridge.model.MHost;
 import com.cloud.bridge.persist.EntityDao;
 
-/**
- * @author Kelven Yang
- */
 public class MHostDao extends EntityDao<MHost> {
 	public MHostDao() {
 		super(MHost.class);
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDao.java b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDao.java
index 6753e9c95c5..efee98c3f65 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostMountDao.java
@@ -19,9 +19,6 @@ package com.cloud.bridge.persist.dao;
 import com.cloud.bridge.model.MHostMount;
 import com.cloud.bridge.persist.EntityDao;
 
-/**
- * @author Kelven Yang
- */
 public class MHostMountDao extends EntityDao<MHostMount> {
 	public MHostMountDao() {
 		super(MHostMount.class);
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SAclDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SAclDao.java
index 37f18f36ade..d62ae5b9304 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SAclDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SAclDao.java
@@ -25,9 +25,6 @@ import com.cloud.bridge.persist.PersistContext;
 import com.cloud.bridge.service.core.s3.S3AccessControlList;
 import com.cloud.bridge.service.core.s3.S3Grant;
 
-/**
- * @author Kelven Yang
- */
 public class SAclDao extends EntityDao<SAcl> {
 	
 	public SAclDao() {
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDao.java
index 25845970c0f..833bf6a7271 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SBucketDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SBucketDao.java
@@ -21,9 +21,6 @@ import java.util.List;
 import com.cloud.bridge.model.SBucket;
 import com.cloud.bridge.persist.EntityDao;
 
-/**
- * @author Kelven Yang
- */
 public class SBucketDao extends EntityDao<SBucket> {
 	public SBucketDao() {
 		super(SBucket.class);
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SHostDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SHostDao.java
index 2641fdb3435..1108bcbb037 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SHostDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SHostDao.java
@@ -19,9 +19,6 @@ package com.cloud.bridge.persist.dao;
 import com.cloud.bridge.model.SHost;
 import com.cloud.bridge.persist.EntityDao;
 
-/**
- * @author Kelven Yang
- */
 public class SHostDao extends EntityDao<SHost> {
 	public SHostDao() {
 		super(SHost.class);
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDao.java
index 1bc7933936e..b781bbb6d4f 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SMetaDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SMetaDao.java
@@ -23,9 +23,6 @@ import com.cloud.bridge.persist.EntityDao;
 import com.cloud.bridge.persist.PersistContext;
 import com.cloud.bridge.service.core.s3.S3MetaDataEntry;
 
-/**
- * @author Kelven Yang, John Zucker
- */
 public class SMetaDao extends EntityDao<SMeta> {
 	public SMetaDao() {
 		super(SMeta.class);
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDao.java
index ac00e03b835..3d87cbe5036 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectDao.java
@@ -24,9 +24,6 @@ import com.cloud.bridge.model.SObject;
 import com.cloud.bridge.persist.EntityDao;
 import com.cloud.bridge.util.EntityParam;
 
-/**
- * @author Kelven Yang
- */
 public class SObjectDao extends EntityDao<SObject> {
 	public SObjectDao() {
 		super(SObject.class);
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDao.java b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDao.java
index 62b424eb678..f91d180d0ac 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDao.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/SObjectItemDao.java
@@ -19,9 +19,6 @@ package com.cloud.bridge.persist.dao;
 import com.cloud.bridge.model.SObjectItem;
 import com.cloud.bridge.persist.EntityDao;
 
-/**
- * @author Kelven Yang
- */
 public class SObjectItemDao extends EntityDao<SObjectItem> {
 	public SObjectItemDao() {
 		super(SObjectItem.class);
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
index 39b5cf675db..0ea862d10b2 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3BucketAction.java
@@ -110,9 +110,6 @@ import com.cloud.bridge.util.XSerializerXmlAdapter;
 import com.cloud.bridge.util.XmlHelper;
 
 
-/**
- * @author Kelven Yang, John Zucker
- */
 public class S3BucketAction implements ServletAction {
     protected final static Logger logger = Logger.getLogger(S3BucketAction.class);
     
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
index 0aba4ba8deb..8fb89f9de4e 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3ObjectAction.java
@@ -80,9 +80,6 @@ import com.cloud.bridge.util.HeaderParam;
 import com.cloud.bridge.util.ServletRequestDataSource;
 import com.cloud.bridge.util.OrderedPair;
 
-/**
- * @author Kelven Yang, John Zucker
- */
 public class S3ObjectAction implements ServletAction {
     protected final static Logger logger = Logger.getLogger(S3ObjectAction.class);
 
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
index 1bb5834624f..97fe6b15eb8 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/S3SerializableServiceImplementation.java
@@ -107,7 +107,7 @@ import com.cloud.bridge.service.core.s3.S3SetBucketAccessControlPolicyRequest;
 import com.cloud.bridge.service.core.s3.S3SetObjectAccessControlPolicyRequest;
 import com.cloud.bridge.service.exception.InternalErrorException;
 
-/* @Author Kelven Yang, John Zucker
+/* 
  *  Implementation of S3 service requests as operations defined by the interface, com.amazon.s3.AmazonS3SkeletonInterface.
  * The operations dispatched from this class are of the form of SOAP operations which define business logic to be executed by the request.  
  * The methods required for S3 services in accordance with the skeleton are either implementations of the following
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
index 7a36a4b9bf8..c8ca2bd5351 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
@@ -58,9 +58,6 @@ import com.cloud.bridge.util.DateHelper;
 import com.cloud.bridge.util.NetHelper;
 import com.cloud.bridge.util.OrderedPair;
 
-/**
- * @author Kelven Yang
- */
 public class ServiceProvider {
 	protected final static Logger logger = Logger.getLogger(ServiceProvider.class);
 
diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/ServletAction.java b/awsapi/src/com/cloud/bridge/service/controller/s3/ServletAction.java
index 1f73d365215..be809f4eeee 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServletAction.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServletAction.java
@@ -22,9 +22,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.stream.XMLStreamException;
 
-/**
- * @author Kelven Yang
- */
 public interface ServletAction {
 	void execute(HttpServletRequest request, HttpServletResponse response) throws IOException, XMLStreamException;
 }
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2AddressFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2AddressFilterSet.java
index e6000efa8be..cb21fb2c0ae 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2AddressFilterSet.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2AddressFilterSet.java
@@ -26,10 +26,6 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 
-/**
- * @author slriv
- *
- */
 public class EC2AddressFilterSet {
 	protected final static Logger logger = Logger.getLogger(EC2KeyPairFilterSet.class);
 	
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairs.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairs.java
index d75d38e5f11..eb8fb516257 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairs.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairs.java
@@ -20,10 +20,6 @@ package com.cloud.bridge.service.core.ec2;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author slriv
- *
- */
 public class EC2DescribeKeyPairs {
 	private EC2KeyPairFilterSet keyFilterSet;
 	private List<String> keyNames;
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairsResponse.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairsResponse.java
index cfa0262b41f..b7a4cce6d03 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairsResponse.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2DescribeKeyPairsResponse.java
@@ -20,10 +20,6 @@ package com.cloud.bridge.service.core.ec2;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @author slriv
- *
- */
 public class EC2DescribeKeyPairsResponse {
 	
 	protected List<EC2SSHKeyPair> keyPairSet = new ArrayList<EC2SSHKeyPair>();    
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2KeyPairFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2KeyPairFilterSet.java
index 16237038bda..021487c7f71 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2KeyPairFilterSet.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2KeyPairFilterSet.java
@@ -25,10 +25,6 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 
-/**
- * @author slriv
- *
- */
 public class EC2KeyPairFilterSet {
 	protected final static Logger logger = Logger.getLogger(EC2KeyPairFilterSet.class);
 	
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3AccessControlList.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3AccessControlList.java
index a66d6a4895d..07199a29d63 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3AccessControlList.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3AccessControlList.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @author Kelven Yang, John Zucker
  * An S3AccessControlList is simply a holder of grants depicted as instances of S3Grant.
  */
 public class S3AccessControlList {
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3AccessControlPolicy.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3AccessControlPolicy.java
index 8dcb3116cc8..f4f37ebe4c9 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3AccessControlPolicy.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3AccessControlPolicy.java
@@ -16,9 +16,6 @@
 // under the License.
 package com.cloud.bridge.service.core.s3;
 
-/**
- * @author Kelven Yang
- */
 public class S3AccessControlPolicy  extends S3Response {
 	protected S3CanonicalUser owner;
 	protected S3Grant[] grants;
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3CanonicalUser.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3CanonicalUser.java
index f2b502a8783..881ab1ff34f 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3CanonicalUser.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3CanonicalUser.java
@@ -18,9 +18,6 @@ package com.cloud.bridge.service.core.s3;
 
 import com.cloud.bridge.util.XElement;
 
-/**
- * @author Kelven Yang
- */
 public class S3CanonicalUser {
 	
 	@XElement(name="ID")
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineRequest.java
index c3a0debca50..904059117d6 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineRequest.java
@@ -22,9 +22,6 @@ import java.io.InputStream;
 
 import javax.activation.DataHandler;
 
-/**
-  * @author Kelven Yang, John Zucker
- */
 public class S3PutObjectInlineRequest extends S3Request {
 	protected String bucketName;
 	protected String key;
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineResponse.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineResponse.java
index b75ee05c781..e886ffa6117 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineResponse.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectInlineResponse.java
@@ -18,9 +18,6 @@ package com.cloud.bridge.service.core.s3;
 
 import java.util.Calendar;
 
-/**
- * @author Kelven Yang, John Zucker
- */
 public class S3PutObjectInlineResponse extends S3Response {
 	protected String ETag;
 	protected Calendar lastModified;
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectRequest.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectRequest.java
index 076e61a6830..d41bc682afd 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectRequest.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectRequest.java
@@ -18,9 +18,6 @@ package com.cloud.bridge.service.core.s3;
 
 import java.io.InputStream;
 
-/**
- * @author Kelven Yang
- */
 public class S3PutObjectRequest extends S3Request {
 	protected String bucketName;
 	protected String key;
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectResponse.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectResponse.java
index 28385e396f2..476c5e3860f 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectResponse.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3PutObjectResponse.java
@@ -18,9 +18,6 @@ package com.cloud.bridge.service.core.s3;
 
 import java.util.Calendar;
 
-/**
- * @author Kelven Yang
- */
 public class S3PutObjectResponse extends S3Response {
 	protected String ETag;
 	protected Calendar lastModified;
diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Request.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Request.java
index 439b98d3ac9..71d52c69340 100644
--- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Request.java
+++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Request.java
@@ -18,9 +18,6 @@ package com.cloud.bridge.service.core.s3;
 
 import java.util.Calendar;
 
-/**
- * @author Kelven
- */
 public class S3Request {
 	protected String accessKey;
 	protected String signature;
diff --git a/awsapi/src/com/cloud/bridge/util/CloudStackSessionFactory.java b/awsapi/src/com/cloud/bridge/util/CloudStackSessionFactory.java
index a5e97b81fd6..ac5e2d5d71b 100644
--- a/awsapi/src/com/cloud/bridge/util/CloudStackSessionFactory.java
+++ b/awsapi/src/com/cloud/bridge/util/CloudStackSessionFactory.java
@@ -29,10 +29,6 @@ import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
 import org.jasypt.properties.EncryptableProperties;
 import org.apache.log4j.Logger;
 
-
-/**
- * @author Kelven Yang
- */
 public class CloudStackSessionFactory {
 	private static CloudStackSessionFactory instance;
 	public static final Logger logger = Logger.getLogger(CloudStackSessionFactory.class);
diff --git a/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java
index 18764198f61..b4a14d16aee 100644
--- a/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java
+++ b/awsapi/src/com/cloud/bridge/util/ISO8601SimpleDateTimeFormat.java
@@ -27,7 +27,6 @@ import java.util.Calendar;
 import java.util.TimeZone;
 
 /**
- * @author John Zucker
  * Format and parse a date string which is expected to be in ISO 8601 DateTimeFormat especially for 
  * use in XML documents.
  * An example is for use with GMTDateTimeUserType to provide parsing of DateTime format strings into 
diff --git a/awsapi/src/com/cloud/bridge/util/XFlatten.java b/awsapi/src/com/cloud/bridge/util/XFlatten.java
index d9c894554d0..a99722f4d60 100644
--- a/awsapi/src/com/cloud/bridge/util/XFlatten.java
+++ b/awsapi/src/com/cloud/bridge/util/XFlatten.java
@@ -21,9 +21,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @author Kelven Yang
- */
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface XFlatten {
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackKeyPair.java b/awsapi/src/com/cloud/stack/models/CloudStackKeyPair.java
index 221f0ddfa2b..8e34211d252 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackKeyPair.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackKeyPair.java
@@ -19,10 +19,6 @@ package com.cloud.stack.models;
 
 import com.google.gson.annotations.SerializedName;
 
-/**
- * @author slriv
- *
- */
 public class CloudStackKeyPair {
 	@SerializedName(ApiConstants.FINGERPRINT)
 	private String fingerprint;