diff --git a/pi4j-core/src/main/java/com/pi4j/platform/impl/DefaultRuntimePlatforms.java b/pi4j-core/src/main/java/com/pi4j/platform/impl/DefaultRuntimePlatforms.java
index 2c122fe2..8f6cea23 100644
--- a/pi4j-core/src/main/java/com/pi4j/platform/impl/DefaultRuntimePlatforms.java
+++ b/pi4j-core/src/main/java/com/pi4j/platform/impl/DefaultRuntimePlatforms.java
@@ -37,10 +37,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
diff --git a/pi4j-core/src/main/java/com/pi4j/provider/impl/DefaultRuntimeProviders.java b/pi4j-core/src/main/java/com/pi4j/provider/impl/DefaultRuntimeProviders.java
index 6717a789..fc576d8c 100644
--- a/pi4j-core/src/main/java/com/pi4j/provider/impl/DefaultRuntimeProviders.java
+++ b/pi4j-core/src/main/java/com/pi4j/provider/impl/DefaultRuntimeProviders.java
@@ -47,10 +47,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**