diff --git a/markdown/src/main/java/org/apache/zeppelin/markdown/Markdown.java b/markdown/src/main/java/org/apache/zeppelin/markdown/Markdown.java
index 88b3287869f..4a98c6052c7 100644
--- a/markdown/src/main/java/org/apache/zeppelin/markdown/Markdown.java
+++ b/markdown/src/main/java/org/apache/zeppelin/markdown/Markdown.java
@@ -32,10 +32,6 @@
 
 /**
  * Markdown interpreter for Zeppelin.
- *
- * @author Leemoonsoo
- * @author anthonycorbacho
- *
  */
 public class Markdown extends Interpreter {
   private Markdown4jProcessor md;
diff --git a/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java b/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
index 5681e7d3ae2..090c0e935c7 100644
--- a/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
+++ b/shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
@@ -38,10 +38,6 @@
 
 /**
  * Shell interpreter for Zeppelin.
- *
- * @author Leemoonsoo
- * @author anthonycorbacho
- *
  */
 public class ShellInterpreter extends Interpreter {
   Logger logger = LoggerFactory.getLogger(ShellInterpreter.class);
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java
index 88582cd5f5d..82ebc9baeee 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkSqlInterpreter.java
@@ -41,9 +41,6 @@
 
 /**
  * Spark SQL interpreter for Zeppelin.
- *
- * @author Leemoonsoo
- *
  */
 public class SparkSqlInterpreter extends Interpreter {
   Logger logger = LoggerFactory.getLogger(SparkSqlInterpreter.class);
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java b/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java
index 0cb2f16ec0d..0d2d50c0e21 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/ZeppelinContext.java
@@ -51,9 +51,6 @@
 
 /**
  * Spark context for zeppelin.
- *
- * @author Leemoonsoo
- *
  */
 public class ZeppelinContext extends HashMap<String, Object> {
   private DependencyResolver dep;
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/dep/Booter.java b/spark/src/main/java/org/apache/zeppelin/spark/dep/Booter.java
index ece39c3c9f2..1b7a6d653d9 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/dep/Booter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/dep/Booter.java
@@ -27,9 +27,6 @@
 
 /**
  * Manage mvn repository.
- *
- * @author anthonycorbacho
- *
  */
 public class Booter {
   public static RepositorySystem newRepositorySystem() {
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/dep/DependencyResolver.java b/spark/src/main/java/org/apache/zeppelin/spark/dep/DependencyResolver.java
index 0a305300ddc..eed3924e863 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/dep/DependencyResolver.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/dep/DependencyResolver.java
@@ -57,9 +57,6 @@
 /**
  * Deps resolver.
  * Add new dependencies from mvn repo (at runetime) to Zeppelin.
- *
- * @author anthonycorbacho
- *
  */
 public class DependencyResolver {
   Logger logger = LoggerFactory.getLogger(DependencyResolver.class);
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/dep/RepositoryListener.java b/spark/src/main/java/org/apache/zeppelin/spark/dep/RepositoryListener.java
index 8a36f37aa04..86b3334c6ea 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/dep/RepositoryListener.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/dep/RepositoryListener.java
@@ -24,9 +24,6 @@
 
 /**
  * Simple listener that print log.
- *
- * @author anthonycorbacho
- *
  */
 public class RepositoryListener extends AbstractRepositoryListener {
   Logger logger = LoggerFactory.getLogger(RepositoryListener.class);
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/dep/RepositorySystemFactory.java b/spark/src/main/java/org/apache/zeppelin/spark/dep/RepositorySystemFactory.java
index 00fac7f7a1c..cc0740dd3f5 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/dep/RepositorySystemFactory.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/dep/RepositorySystemFactory.java
@@ -29,9 +29,6 @@
 
 /**
  * Get maven repository instance.
- *
- * @author anthonycorbacho
- *
  */
 public class RepositorySystemFactory {
   public static RepositorySystem newRepositorySystem() {
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/dep/TransferListener.java b/spark/src/main/java/org/apache/zeppelin/spark/dep/TransferListener.java
index 30daec9ca07..8a4058ab919 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/dep/TransferListener.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/dep/TransferListener.java
@@ -32,9 +32,6 @@
 
 /**
  * Simple listener that show deps downloading progress.
- *
- * @author anthonycorbacho
- *
  */
 public class TransferListener extends AbstractTransferListener {
   Logger logger = LoggerFactory.getLogger(TransferListener.class);
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java
index 8ae76304e3e..37726109594 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/GUI.java
@@ -26,9 +26,6 @@
 
 /**
  * Settings of a form.
- *
- * @author Leemoonsoo
- *
  */
 public class GUI implements Serializable {
 
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java
index 2f7858ca03c..3b1b1d26abc 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/Input.java
@@ -28,16 +28,10 @@
 
 /**
  * Input type.
- *
- * @author Leemoonsoo
- *
  */
 public class Input implements Serializable {
   /**
    * Parameters option.
-   *
-   * @author Leemoonsoo
-   *
    */
   public static class ParamOption {
     Object value;
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobListener.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobListener.java
index 1ed551f385b..9ee274654ff 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobListener.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobListener.java
@@ -19,9 +19,6 @@
 
 /**
  * TODO(moon) : add description.
- *
- * @author Leemoonsoo
- *
  */
 public interface JobListener {
   public void onProgressUpdate(Job job, int progress);
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobProgressPoller.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobProgressPoller.java
index 9de132529ee..2d303947079 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobProgressPoller.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/JobProgressPoller.java
@@ -22,9 +22,6 @@
 
 /**
  * TODO(moon) : add description.
- *
- * @author Leemoonsoo
- *
  */
 public class JobProgressPoller extends Thread {
   public static final long DEFAULT_INTERVAL_MSEC = 500;
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java
index 71769b4365d..c4e72b5029d 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerFactory.java
@@ -30,9 +30,6 @@
 
 /**
  * TODO(moon) : add description.
- *
- * @author Leemoonsoo
- *
  */
 public class SchedulerFactory implements SchedulerListener {
   private final Logger logger = LoggerFactory.getLogger(SchedulerFactory.class);
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerListener.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerListener.java
index 6fdd1765923..79232e61a5a 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerListener.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/SchedulerListener.java
@@ -19,9 +19,6 @@
 
 /**
  * TODO(moon) : add description.
- *
- * @author Leemoonsoo
- *
  */
 public interface SchedulerListener {
   public void jobStarted(Scheduler scheduler, Job job);
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookResponse.java b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookResponse.java
index 1397ac19874..16b66920a22 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookResponse.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookResponse.java
@@ -21,9 +21,6 @@
 
 /**
  * Response wrapper.
- *
- * @author anthonycorbacho
- *
  */
 @XmlRootElement
 public class NotebookResponse {
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/JsonResponse.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/JsonResponse.java
index f8f1bdd95a9..8c640ee0603 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/JsonResponse.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/JsonResponse.java
@@ -31,8 +31,6 @@
 /**
  * Json response builder.
  *
- * @author Leemoonsoo
- *
  * @param <T>
  */
 public class JsonResponse<T> {
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java
index 7a1c749b010..dc657bdda06 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java
@@ -22,16 +22,10 @@
 
 /**
  * Zeppelin websocker massage template class.
- *
- * @author Leemoonsoo
- *
  */
 public class Message {
   /**
    * Representation of event type.
-   *
-   * @author Leemoonsoo
-   *
    */
   public static enum OP {
     GET_HOME_NOTE, // [c-s] load note for home screen
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/server/CorsFilterTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/server/CorsFilterTest.java
index a3057c83ed2..a76d4c86a6d 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/server/CorsFilterTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/server/CorsFilterTest.java
@@ -35,10 +35,6 @@
 
 /**
  * BASIC Cors rest api tests
- *
- *
- * @author joelz
- *
  */
 public class CorsFilterTest {
 
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
index a4d23e93ef5..87d1c20aa00 100755
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/conf/ZeppelinConfiguration.java
@@ -376,9 +376,6 @@ public List<String> getAllowedOrigins()
 
   /**
    * Wrapper class.
-   *
-   * @author Leemoonsoo
-   *
    */
   public static enum ConfVars {
     ZEPPELIN_HOME("zeppelin.home", "../"),
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/JobListenerFactory.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/JobListenerFactory.java
index 23cd9571ba5..5a7e966c99e 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/JobListenerFactory.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/JobListenerFactory.java
@@ -21,9 +21,6 @@
 
 /**
  * TODO(moon): provide description.
- *
- * @author Leemoonsoo
- *
  */
 public interface JobListenerFactory {
   public JobListener getParagraphJobListener(Note note);
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
index c98f2fb3fab..dcde50f8c82 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
@@ -403,9 +403,6 @@ public void setJobListenerFactory(JobListenerFactory jobListenerFactory) {
 
   /**
    * Cron task for the note.
-   *
-   * @author Leemoonsoo
-   *
    */
   public static class CronJob implements org.quartz.Job {
     public static Notebook notebook;
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java
index 812dd764a0d..11f9dcc9d2a 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/utility/IdHashes.java
@@ -23,9 +23,6 @@
 
 /**
  * Generate Tiny ID.
- *
- * @author anthonycorbacho
- *
  */
 public class IdHashes {
   public static final char[] DICTIONARY = new char[] {'1', '2', '3', '4', '5', '6', '7', '8', '9',
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/util/Util.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/util/Util.java
index 135ffdac9f0..fc19d0fe27a 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/util/Util.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/util/Util.java
@@ -23,9 +23,6 @@
 
 /**
  * TODO(moon) : add description.
- *
- * @author Leemoonsoo
- *
  */
 public class Util {