diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
index 88902ca93..20fde2320 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java
@@ -367,12 +367,6 @@ public final class ConfigurationLoader {
                 prev = pos + 1;
             }
             else if (value.charAt(pos + 1) != '{') {
-                //peek ahead to see if the next char is a property or not
-                //not a property: insert the char as a literal
-                /*
-                fragments.addElement(value.substring(pos + 1, pos + 2));
-                prev = pos + 2;
-                */
                 if (value.charAt(pos + 1) == '$') {
                     //backwards compatibility two $ map to one mode
                     fragments.add("$");
@@ -440,7 +434,6 @@ public final class ConfigurationLoader {
          */
         public InternalLoader()
             throws SAXException, ParserConfigurationException {
-            // super(DTD_PUBLIC_ID_1_1, DTD_RESOURCE_NAME_1_1);
             super(createIdToResourceNameMap());
         }
 
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java
index 9535e5323..e989445e5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/TokenTypes.java
@@ -35,13 +35,6 @@ public final class TokenTypes {
     // The following three types are never part of an AST,
     // left here as a reminder so nobody will read them accidentally
 
-    /* * token representing a NULL_TREE_LOOKAHEAD */
-    // public static final int NULL_TREE_LOOKAHEAD = 3;
-    /* * token representing a BLOCK */
-    // public static final int BLOCK = 4;
-    /* * token representing a VOCAB */
-    // public static final int VOCAB = 149;
-
     // These are the types that can actually occur in an AST
     // it makes sense to register Checks for these types
 
@@ -1091,13 +1084,6 @@ public final class TokenTypes {
      * @see #SUPER_CTOR_CALL
      **/
     public static final int CTOR_CALL = GeneratedJavaTokenTypes.CTOR_CALL;
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see #PACKAGE_DEF
-     **/
-    //public static final int LITERAL_PACKAGE =
-    //    GeneratedJavaTokenTypes.LITERAL_package;
 
     /**
      * The statement terminator (<code>;</code>).  Depending on the
@@ -1110,21 +1096,7 @@ public final class TokenTypes {
      * @see #LITERAL_FOR
      **/
     public static final int SEMI = GeneratedJavaTokenTypes.SEMI;
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see #IMPORT
-     **/
-    // public static final int LITERAL_IMPORT =
-    //     GeneratedJavaTokenTypes.LITERAL_import;
 
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see #INDEX_OP
-     * @see #ARRAY_DECLARATOR
-     **/
-    //public static final int LBRACK = GeneratedJavaTokenTypes.LBRACK;
     /**
      * The <code>]</code> symbol.
      *
@@ -1356,14 +1328,6 @@ public final class TokenTypes {
     public static final int LITERAL_CLASS =
         GeneratedJavaTokenTypes.LITERAL_class;
 
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see #EXTENDS_CLAUSE
-     **/
-    //public static final int LITERAL_EXTENDS =
-    //    GeneratedJavaTokenTypes.LITERAL_extends;
-
     /**
      * The <code>interface</code> keyword. This token appears in
      * interface definition.
@@ -1399,13 +1363,6 @@ public final class TokenTypes {
      * @see #IMPLEMENTS_CLAUSE
      **/
     public static final int COMMA = GeneratedJavaTokenTypes.COMMA;
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see #IMPLEMENTS_CLAUSE
-     **/
-    // public static final int LITERAL_IMPLEMENTS =
-    //     GeneratedJavaTokenTypes.LITERAL_implements;
 
     /**
      * A left parenthesis (<code>(</code>).
@@ -2685,65 +2642,6 @@ public final class TokenTypes {
      * @see #NUM_FLOAT
      **/
     public static final int NUM_DOUBLE = GeneratedJavaTokenTypes.NUM_DOUBLE;
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see <a
-     * href="http://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-3.6">Java
-     * Language Specification, &sect;3.6</a>
-     * @see FileContents
-     **/
-    //public static final int WS = GeneratedJavaTokenTypes.WS;
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see <a
-     * href="http://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-3.7">Java
-     * Language Specification, &sect;3.7</a>
-     * @see FileContents
-     **/
-    //public static final int SL_COMMENT = GeneratedJavaTokenTypes.SL_COMMENT;
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see <a
-     * href="http://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-3.7">Java
-     * Language Specification, &sect;3.7</a>
-     * @see FileContents
-     **/
-    //public static final int ML_COMMENT = GeneratedJavaTokenTypes.ML_COMMENT;
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see <a
-     * href="http://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-3.10.6">Java
-     * Language Specification, &sect;3.10.6</a>
-     * @see #CHAR_LITERAL
-     * @see #STRING_LITERAL
-     **/
-    //public static final int ESC = GeneratedJavaTokenTypes.ESC;
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see #NUM_INT
-     * @see #NUM_LONG
-     **/
-    //public static final int HEX_DIGIT = GeneratedJavaTokenTypes.HEX_DIGIT;
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see #NUM_FLOAT
-     * @see #NUM_DOUBLE
-     **/
-    //public static final int EXPONENT = GeneratedJavaTokenTypes.EXPONENT;
-    /* *
-     * This token does not appear in the tree.
-     *
-     * @see #NUM_FLOAT
-     * @see #NUM_DOUBLE
-     **/
-    // public static final int FLOAT_SUFFIX =
-    //     GeneratedJavaTokenTypes.FLOAT_SUFFIX;
 
     /**
      * The <code>assert</code> keyword.  This is only for Java 1.4 and