diff --git a/sun_checks.xml b/sun_checks.xml
index 7822e7a..3e7de86 100644
--- a/sun_checks.xml
+++ b/sun_checks.xml
@@ -31,9 +31,9 @@
     <property name="severity" value="ignore"/>
     <property name="acceptOnMatch" value="false"/>
   </module>
-  <module name="SuppressionFilter">
+  <!-- <module name="SuppressionFilter">
     <property name="file" value="${checkstyle.suppressions.file}"/>
-  </module>
+  </module> -->
   <!-- Tone down the checking for test code -->
   <module name="SuppressionSingleFilter">
     <property name="checks" value="JavadocPackage"/>
@@ -61,7 +61,7 @@
   </module>
 
   <!-- Headers -->
-  <module name="Header">
+  <!-- <module name="Header">
     <property name="headerFile" value="${checkstyle.header.file}"/>
     <property name="fileExtensions" value="java, g4"/>
     <property name="id" value="header"/>
@@ -70,7 +70,7 @@
     <property name="id" value="regexpHeader"/>
     <property name="headerFile" value="${checkstyle.regexp.header.file}"/>
     <property name="fileExtensions" value="java, g4"/>
-  </module>
+  </module> -->
 
   <!-- Javadoc Comments -->
   <module name="JavadocPackage">
@@ -609,9 +609,9 @@
       <property name="offCommentFormat" value="CSOFF\: .*"/>
       <property name="onCommentFormat" value="CSON\: .*"/>
     </module>
-    <module name="SuppressionXpathFilter">
+    <!-- <module name="SuppressionXpathFilter">
       <property name="file" value="${checkstyle.suppressions-xpath.file}"/>
-    </module>
+    </module> -->
     <!-- Tone down the checking for test code -->
     <module name="SuppressionXpathSingleFilter">
       <property name="files" value="[\\/]internal[\\/].*[\\/]\w+Util\.java"/>
@@ -670,7 +670,7 @@
       <property name="separateLineBetweenGroups" value="true"/>
     </module>
     <module name="IllegalImport"/>
-    <module name="ImportControl">
+    <!-- <module name="ImportControl">
       <property name="id" value="ImportControlMain"/>
       <property name="file" value="${checkstyle.importcontrol.file}"/>
       <property name="path" value="^.*[\\/]src[\\/]main[\\/].*$"/>
@@ -679,7 +679,7 @@
       <property name="id" value="ImportControlTest"/>
       <property name="file" value="${checkstyle.importcontroltest.file}"/>
       <property name="path" value="^.*[\\/]src[\\/](test|it)[\\/].*$"/>
-    </module>
+    </module> -->
     <module name="ImportOrder">
       <property name="groups" value="/^java\./,javax,org"/>
       <property name="ordered" value="true"/>
@@ -818,7 +818,7 @@
     </module>
     <module name="ModifierOrder"/>
     <module name="RedundantModifier">
-      <property name="jdkVersion" value="${checkstyle.java.version}"/>
+      <property name="jdkVersion" value="22"/>
     </module>
 
     <!-- Naming Conventions -->