diff --git a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathDirEntry.java b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathDirEntry.java
index 3ee3526568d0f93224ccedc699f0fcf7a7c3815b..b1e8fe294f4140d968ba33908e2521c9bdd8f32d 100644
--- a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathDirEntry.java
+++ b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathDirEntry.java
@@ -36,8 +36,7 @@ import java.nio.file.*;
 import java.nio.file.attribute.*;
 
 /**
- * * Handler for dirs containing classes to compile.
- * @author igor.ignatyev@oracle.com
+ * Handler for dirs containing classes to compile.
  */
 public class ClassPathDirEntry extends PathHandler {
 
diff --git a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarEntry.java b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarEntry.java
index 3d39f1b25737e1b2d6e5ad93a1a7e1a891ddc5cc..a639a6371592df7f3d82ede363944f310e101019 100644
--- a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarEntry.java
+++ b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarEntry.java
@@ -35,7 +35,6 @@ import java.nio.file.*;
 
 /**
  * Handler for jar-files containing classes to compile.
- * @author igor.ignatyev@oracle.com
  */
 public class ClassPathJarEntry extends PathHandler {
 
diff --git a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarInDirEntry.java b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarInDirEntry.java
index 328280a2d88f2ea612f028ac90448a7269cbfcc2..a9f7c8a964eb8be4017b8b5e154199d69eae0304 100644
--- a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarInDirEntry.java
+++ b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassPathJarInDirEntry.java
@@ -31,8 +31,6 @@ import java.util.concurrent.Executor;
 
 /**
  * Handler for dirs containing jar-files with classes to compile.
- *
- * @author igor.ignatyev@oracle.com
  */
 public class ClassPathJarInDirEntry extends PathHandler {
 
diff --git a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassesListInFile.java b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassesListInFile.java
index 6f36d8b5c6d2036c7f864a63b3e456f3f0ca8e80..d25364ad5618402dede5342383f5933c6192c908 100644
--- a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassesListInFile.java
+++ b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/ClassesListInFile.java
@@ -32,8 +32,6 @@ import java.util.concurrent.Executor;
 
 /**
  * Handler for files containing a list of classes to compile.
- *
- * @author igor.ignatyev@oracle.com
  */
 public class ClassesListInFile extends PathHandler {
     public ClassesListInFile(Path root, Executor executor) {
diff --git a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java
index f1d46526d31a2d24bf10a0f3cdd2374edc9e073f..12d09434d7bb5e39e622d286043b17ba3540c8ae 100644
--- a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java
+++ b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/CompileTheWorld.java
@@ -32,9 +32,6 @@ import java.nio.file.Paths;
 import java.util.List;
 import java.util.concurrent.*;
 
-/**
- * @author igor.ignatyev@oracle.com
- */
 public class CompileTheWorld {
     /**
      * Entry point. Compiles classes in {@code args}, or all classes in
diff --git a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
index ccb2d3ae53a8789b1f0aeb3f8ef7148f65a1016a..1a5a034869a23f7c5b8c7e14259213bb068be2f3 100644
--- a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
+++ b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java
@@ -36,8 +36,6 @@ import java.util.concurrent.atomic.AtomicLong;
 /**
  * Provide method to compile whole class.
  * Also contains compiled methods and classes counters.
- *
- * @author igor.ignatyev@oracle.com
  */
 public class Compiler {
     private Compiler() { }
diff --git a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java
index 5c284f896a86623e0ae3781995f62308abd1ba6f..04b23e757709823cbfbb24d6a57636df89f0654c 100644
--- a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java
+++ b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/PathHandler.java
@@ -35,10 +35,7 @@ import java.util.concurrent.Executor;
 
 /**
  * Abstract handler for path.
- * <p/>
  * Concrete subclasses should implement method {@link #process()}.
- *
- * @author igor.ignatyev@oracle.com
  */
 public abstract class PathHandler {
     private static final Pattern JAR_IN_DIR_PATTERN
diff --git a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java
index 5ffd06cee8bef5d6d835ed36e929c3e1a3f87589..ea621cb7b397f075dabdc7e2685cd3b822be96a1 100644
--- a/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java
+++ b/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Utils.java
@@ -31,8 +31,6 @@ import java.util.regex.Pattern;
 
 /**
  * Auxiliary methods.
- *
- * @author igor.ignatyev@oracle.com
  */
 public class Utils {
     /**