diff --git a/config/pmd.xml b/config/pmd.xml
index c1b6ff4a9..6043cf083 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -140,8 +140,6 @@
     <exclude name="MissingBreakInSwitch"/>
     <!-- we need compare by ref as Tree structure is immutable, we can easily rely on refs -->
     <exclude name="CompareObjectsWithEquals"/>
-    <!-- till #995 -->
-    <exclude name="UncommentedEmptyMethod"/>
     <!-- till #996 -->
     <exclude name="PreserveStackTrace"/>
     <!-- we will use our own declaration order logic -->
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java
index 683da8b0d..ff5e76ccd 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/DefaultLogger.java
@@ -140,11 +140,13 @@ public class DefaultLogger
     /** {@inheritDoc} */
     @Override
     public void fileFinished(AuditEvent evt) {
+        // No need to implement this method in this class
     }
 
     /** {@inheritDoc} */
     @Override
     public void fileStarted(AuditEvent evt) {
+        // No need to implement this method in this class
     }
 
     /** {@inheritDoc} */
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
index 59d749f1c..5628025dc 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AbstractFileSetCheck.java
@@ -54,16 +54,19 @@ public abstract class AbstractFileSetCheck
     /** {@inheritDoc} */
     @Override
     public void init() {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /** {@inheritDoc} */
     @Override
     public void destroy() {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /** {@inheritDoc} */
     @Override
     public void beginProcessing(String charset) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /** {@inheritDoc} */
@@ -81,6 +84,7 @@ public abstract class AbstractFileSetCheck
     /** {@inheritDoc} */
     @Override
     public void finishProcessing() {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /** {@inheritDoc} */
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
index 5f4a8df27..9970ddc20 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/AutomaticBean.java
@@ -226,6 +226,7 @@ public class AutomaticBean
      * @throws CheckstyleException if there is a configuration error.
      */
     protected void finishLocalSetup() throws CheckstyleException {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
@@ -239,6 +240,7 @@ public class AutomaticBean
      */
     protected void setupChild(Configuration childConf)
         throws CheckstyleException {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/Check.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/Check.java
index e2438eb02..4a4c17b87 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/Check.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/Check.java
@@ -120,12 +120,14 @@ public abstract class Check extends AbstractViolationReporter {
      * everything required to perform it job.
      */
     public void init() {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
      * Destroy the check. It is being retired from service.
      */
     public void destroy() {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
@@ -134,6 +136,7 @@ public abstract class Check extends AbstractViolationReporter {
      * @param rootAST the root of the tree
      */
     public void beginTree(DetailAST rootAST) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
@@ -142,6 +145,7 @@ public abstract class Check extends AbstractViolationReporter {
      * @param rootAST the root of the tree
      */
     public void finishTree(DetailAST rootAST) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
@@ -149,6 +153,7 @@ public abstract class Check extends AbstractViolationReporter {
      * @param ast the token to process
      */
     public void visitToken(DetailAST ast) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
@@ -156,6 +161,7 @@ public abstract class Check extends AbstractViolationReporter {
      * @param ast the token leaving
      */
     public void leaveToken(DetailAST ast) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java
index 248fc6542..8c48cd4b7 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/SeverityLevelCounter.java
@@ -68,16 +68,19 @@ public final class SeverityLevelCounter implements AuditListener {
     /** {@inheritDoc} */
     @Override
     public void fileStarted(AuditEvent evt) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /** {@inheritDoc} */
     @Override
     public void auditFinished(AuditEvent evt) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /** {@inheritDoc} */
     @Override
     public void fileFinished(AuditEvent evt) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java
index a3b1cbb83..53fc5ff25 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/IllegalTokenTextCheck.java
@@ -72,10 +72,6 @@ public class IllegalTokenTextCheck
         super("$^"); // the empty language
     }
 
-    @Override
-    public void beginTree(DetailAST rootAST) {
-    }
-
     @Override
     public int[] getDefaultTokens() {
         return new int[0];
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java
index e5b95d484..8143fbd19 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java
@@ -220,6 +220,7 @@ public abstract class AbstractHeaderCheck extends AbstractFileSetCheck {
      * This implementation does nothing.
      */
     protected void postprocessHeaderLines() {
+        // No code by default
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java
index 7ca07a945..83ae5ee81 100755
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/AbstractJavadocCheck.java
@@ -96,6 +96,7 @@ public abstract class AbstractJavadocCheck extends Check {
      *        the root of the tree
      */
     public void beginJavadocTree(DetailNode rootAst) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
@@ -104,6 +105,7 @@ public abstract class AbstractJavadocCheck extends Check {
      *        the root of the tree
      */
     public void finishJavadocTree(DetailNode rootAst) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
@@ -112,6 +114,7 @@ public abstract class AbstractJavadocCheck extends Check {
      *        the token to process
      */
     public void visitJavadocToken(DetailNode ast) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
@@ -120,6 +123,7 @@ public abstract class AbstractJavadocCheck extends Check {
      *        the token leaving
      */
     public void leaveJavadocToken(DetailNode ast) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     /**
@@ -170,6 +174,7 @@ public abstract class AbstractJavadocCheck extends Check {
 
     @Override
     public final void leaveToken(DetailAST ast) {
+        // No code by default, should be overridden only by demand at subclasses
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractCellEditor.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractCellEditor.java
index 6d8ebd992..e6a972cd5 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractCellEditor.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/AbstractCellEditor.java
@@ -106,6 +106,7 @@ public class AbstractCellEditor implements CellEditor {
     /** @see CellEditor */
     @Override
     public void cancelCellEditing() {
+        // No code, tree is read-only
     }
 
     /** @see CellEditor */
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java
index 8976973d6..da33c9266 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/FileDrop.java
@@ -314,6 +314,7 @@ class FileDrop {
 
         @Override
         public void dragOver(DropTargetDragEvent dtde) {
+            // No code, tree is read-only
         }
 
         public FileDropTargetListener(Component component, Border dragBorder, Listener listener) {
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java
index 53a047fd1..d8556ea25 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/gui/ParseTreeModel.java
@@ -107,6 +107,7 @@ public class ParseTreeModel extends AbstractTreeTableModel {
 
     @Override
     public void setValueAt(Object aValue, Object node, int column) {
+        // No code, tree is read-only
     }
 
     @Override