diff --git a/config/pmd.xml b/config/pmd.xml
index add20da..d074b20 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -36,6 +36,12 @@
         <exclude name="UseUnderscoresInNumericLiterals"/>
     </rule>
 
+    <rule ref="category/java/codestyle.xml/UnnecessaryImport">
+        <properties>
+            <property name="violationSuppressRegex" value="Unused (static|.*\.\*).*"/>
+        </properties>
+    </rule>
+
     <!-- DESIGN -->
     <rule ref="category/java/design.xml">
         <exclude name="AvoidCatchingGenericException"/>
diff --git a/config/spotbugs/excludeFilter.xml b/config/spotbugs/excludeFilter.xml
deleted file mode 100644
index ddb2db1..0000000
--- a/config/spotbugs/excludeFilter.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FindBugsFilter
-        xmlns="https://github.com/spotbugs/filter/3.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd">
-    <!--    <Match>
-            <Package name="com.foobar.*"/>
-            <Class name="com.foobar.MyClass"/>
-            <Or>
-                <Method name="someMethod"/>
-                <Method name="someOtherMethod"/>
-            </Or>
-            <Bug pattern="DLS_DEAD_LOCAL_STORE"/>
-            <Confidence value="2"/>
-        </Match>-->
-</FindBugsFilter>
diff --git a/src/test/java/net/thauvin/erik/semver/ConstantsTest.java b/src/test/java/net/thauvin/erik/semver/ConstantsTest.java
index 0d7b066..b6c2907 100644
--- a/src/test/java/net/thauvin/erik/semver/ConstantsTest.java
+++ b/src/test/java/net/thauvin/erik/semver/ConstantsTest.java
@@ -38,8 +38,8 @@ import org.junit.jupiter.api.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertEquals; // NOPMD
-import static org.junit.jupiter.api.Assertions.assertTrue; // NOPMD
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * The <code>ConstantsTest</code> class.
diff --git a/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java b/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java
index 66231f0..0ebbbf5 100644
--- a/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java
+++ b/src/test/java/net/thauvin/erik/semver/VersionInfoTest.java
@@ -36,8 +36,8 @@ import org.junit.jupiter.api.Test;
 
 import java.util.Date; // NOPMD
 
-import static org.junit.jupiter.api.Assertions.assertEquals; // NOPMD
-import static org.junit.jupiter.api.Assertions.assertTrue; // NOPMD
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * The <code>VersionInfoTest</code> class.
diff --git a/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java b/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java
index f748f1d..ad3b742 100644
--- a/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java
+++ b/src/test/java/net/thauvin/erik/semver/VersionProcessorTest.java
@@ -38,7 +38,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Properties;
 
-import static org.junit.jupiter.api.Assertions.assertEquals; // NOPMD
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * The <code>VersionProcessorTest</code> class.