diff --git a/conf/checkstyle/onos_suppressions.xml b/conf/checkstyle/onos_suppressions.xml
index 9728687..7f7d569 100644
--- a/conf/checkstyle/onos_suppressions.xml
+++ b/conf/checkstyle/onos_suppressions.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 
-
-
-
 <suppressions>
+     <!--
+        Note: Exclusion definition exists in multiple places.
+        - In file ${findbugs.excludeFilterFile} defined at top of pom.xml
+        - In file conf/checkstyle/onos_suppressions.xml (this file)
+        - maven-pmd-plugin configuration in pom.xml
+          (under build and reporting)
+     -->
+
     <!-- Suppressions for ONOS -->
     <suppress files="edu.stanford.ramcloud.*" checks="[_a-zA-Z0-9]*"/>
     <suppress files="net.floodlightcontroller.*" checks="[_a-zA-Z0-9]*"/>
diff --git a/conf/findbugs/exclude.xml b/conf/findbugs/exclude.xml
index 08b3b5a..4c536ad 100644
--- a/conf/findbugs/exclude.xml
+++ b/conf/findbugs/exclude.xml
@@ -2,7 +2,7 @@
      <!--
         Note: Exclusion definition exists in multiple places.
         - In file ${findbugs.excludeFilterFile} defined at top of pom.xml (this file)
-        - maven-checkstyle-plugin configuration in pom.xml
+        - In file conf/checkstyle/onos_suppressions.xml
         - maven-pmd-plugin configuration in pom.xml
           (under build and reporting)
      -->
diff --git a/pom.xml b/pom.xml
index e975b47..786ecb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -289,7 +289,7 @@
           <!--
             Note: Exclusion definition exists in multiple places.
             - In file ${findbugs.excludeFilterFile} defined at top of pom.xml
-            - maven-checkstyle-plugin configuration in pom.xml
+            - In file conf/checkstyle/onos_suppressions.xml
             - maven-pmd-plugin configuration in pom.xml
               (under build and reporting)
           -->
@@ -416,7 +416,6 @@
             - maven-pmd-plugin configuration in pom.xml
               (under build and reporting)
           -->
-          <excludes>**/datastore/serializers/**</excludes>
           <suppressionsLocation>
              ${basedir}/conf/checkstyle/onos_suppressions.xml
           </suppressionsLocation>
@@ -453,7 +452,7 @@
           <!--
             Note: Exclusion definition exists in multiple places.
             - In file ${findbugs.excludeFilterFile} defined at top of pom.xml
-            - maven-checkstyle-plugin configuration in pom.xml
+            - In file conf/checkstyle/onos_suppressions.xml
             - maven-pmd-plugin configuration in pom.xml
               (under build and reporting)
           -->