diff --git a/agent-simulator/src/com/cloud/resource/SimulatorDiscoverer.java b/agent-simulator/src/com/cloud/resource/SimulatorDiscoverer.java
index 451bf9f9d52..729d4b0fd23 100755
--- a/agent-simulator/src/com/cloud/resource/SimulatorDiscoverer.java
+++ b/agent-simulator/src/com/cloud/resource/SimulatorDiscoverer.java
@@ -56,10 +56,6 @@ import com.cloud.storage.dao.VMTemplateHostDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
 import com.cloud.utils.component.Inject;
 
-/**
- * @author prasanna
- * 
- */
 @Local(value = Discoverer.class)
 public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, Listener, ResourceStateAdapter {
 	private static final Logger s_logger = Logger
@@ -337,4 +333,4 @@ public class SimulatorDiscoverer extends DiscovererBase implements Discoverer, L
         return super.stop();
     }
     
-}
\ No newline at end of file
+}
diff --git a/cloud-cli/cloudapis/__init__.py b/cloud-cli/cloudapis/__init__.py
index e4ec3ab6bb3..f23b2ce2fbf 100644
--- a/cloud-cli/cloudapis/__init__.py
+++ b/cloud-cli/cloudapis/__init__.py
@@ -20,7 +20,6 @@
 '''
 Created on Aug 2, 2010
 
-@author: rudd-o
 '''
 
 import os,pkgutil
diff --git a/cloud-cli/cloudtool/__init__.py b/cloud-cli/cloudtool/__init__.py
index 83880a6b057..c4b479eb790 100644
--- a/cloud-cli/cloudtool/__init__.py
+++ b/cloud-cli/cloudtool/__init__.py
@@ -20,7 +20,6 @@
 '''
 Created on Aug 2, 2010
 
-@author: rudd-o
 '''
 
 import sys
diff --git a/cloud-cli/cloudtool/utils.py b/cloud-cli/cloudtool/utils.py
index 242b3a540ad..e123434614a 100644
--- a/cloud-cli/cloudtool/utils.py
+++ b/cloud-cli/cloudtool/utils.py
@@ -20,7 +20,6 @@
 '''
 Created on Aug 2, 2010
 
-@author: rudd-o
 '''
 
 
diff --git a/test/src/com/cloud/sample/UserCloudAPIExecutor.java b/test/src/com/cloud/sample/UserCloudAPIExecutor.java
index ad99f3635c0..5a00d20ab8a 100644
--- a/test/src/com/cloud/sample/UserCloudAPIExecutor.java
+++ b/test/src/com/cloud/sample/UserCloudAPIExecutor.java
@@ -51,7 +51,6 @@ import org.apache.commons.httpclient.methods.GetMethod;
  * Prerequisites: - Edit usercloud.properties to include your host, apiUrl, apiKey, and secretKey - Use ./executeUserAPI.sh to
  * execute this test class
  * 
- * @author will
  * 
  */
 public class UserCloudAPIExecutor {
diff --git a/ui/scripts/ui/widgets/dataTable.js b/ui/scripts/ui/widgets/dataTable.js
index 176dfd1589c..1b3ea82bc85 100644
--- a/ui/scripts/ui/widgets/dataTable.js
+++ b/ui/scripts/ui/widgets/dataTable.js
@@ -18,7 +18,6 @@
   /**
    * Convert table to be resizable and sortable
    *
-   * @author Brian Federle
    */
   $.fn.dataTable = function(method, options) {
     var $table = this;
diff --git a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoffMBean.java b/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoffMBean.java
index 385ce7660d3..9c5e192abff 100755
--- a/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoffMBean.java
+++ b/utils/src/com/cloud/utils/backoff/impl/ConstantTimeBackoffMBean.java
@@ -20,10 +20,6 @@ import java.util.Collection;
 
 import com.cloud.utils.mgmt.ManagementBean;
 
-/**
- * @author ahuang
- *
- */
 public interface ConstantTimeBackoffMBean extends ManagementBean {
     public long getTimeToWait();