diff --git a/lib/src/main/java/com/github/shautvast/contiguous/BigDecimalHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/BigDecimalHandler.java
index 6150c9d..14e95ef 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/BigDecimalHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/BigDecimalHandler.java
@@ -2,7 +2,6 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
 import java.math.BigDecimal;
 
 class BigDecimalHandler extends BuiltinTypeHandler<BigDecimal> {
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/BigIntegerHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/BigIntegerHandler.java
index 183be82..2212b56 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/BigIntegerHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/BigIntegerHandler.java
@@ -2,7 +2,6 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
 import java.math.BigInteger;
 
 class BigIntegerHandler extends BuiltinTypeHandler<BigInteger> {
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/ByteHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/ByteHandler.java
index 4e0d47e..3aaa007 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/ByteHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/ByteHandler.java
@@ -2,8 +2,6 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
-
 /**
  * Stores a byte value.
  */
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/CompoundTypeHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/CompoundTypeHandler.java
index 1996d1f..9f2fd30 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/CompoundTypeHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/CompoundTypeHandler.java
@@ -1,7 +1,9 @@
 package com.github.shautvast.contiguous;
 
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 class CompoundTypeHandler extends TypeHandler {
     private final Map<String, TypeHandler> properties = new LinkedHashMap<>();
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/ContiguousList.java b/lib/src/main/java/com/github/shautvast/contiguous/ContiguousList.java
index 919e749..c0d67c1 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/ContiguousList.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/ContiguousList.java
@@ -1,11 +1,9 @@
 package com.github.shautvast.contiguous;
 
-import com.github.shautvast.reflective.InvokerFactory;
 import com.github.shautvast.reflective.MetaClass;
 import com.github.shautvast.reflective.MetaMethod;
 import com.github.shautvast.reflective.Reflective;
 
-import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.ByteBuffer;
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/DoubleHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/DoubleHandler.java
index 51a3e84..1a8fdea 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/DoubleHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/DoubleHandler.java
@@ -2,8 +2,6 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
-
 /**
  * Stores a double value.
  */
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/FloatHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/FloatHandler.java
index cb324fb..4ba2752 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/FloatHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/FloatHandler.java
@@ -2,8 +2,6 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
-
 class FloatHandler extends BuiltinTypeHandler<Float> {
     public FloatHandler(String propertyName, MetaMethod getter, MetaMethod setter) {
         super(Float.class, propertyName, getter, setter);
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/IntegerHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/IntegerHandler.java
index e78641b..3622668 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/IntegerHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/IntegerHandler.java
@@ -2,8 +2,6 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
-
 class IntegerHandler extends BuiltinTypeHandler<Integer> {
     public IntegerHandler(String propertyName, MetaMethod getter, MetaMethod setter) {
         super(Integer.class, propertyName, getter, setter);
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/LongHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/LongHandler.java
index e0e6438..0697d26 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/LongHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/LongHandler.java
@@ -2,8 +2,6 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
-
 class LongHandler extends BuiltinTypeHandler<Long> {
     public LongHandler(String propertyName, MetaMethod getter, MetaMethod setter) {
         super(Long.class, propertyName, getter, setter);
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/PropertyHandlerFactory.java b/lib/src/main/java/com/github/shautvast/contiguous/PropertyHandlerFactory.java
index fbbf820..d7be390 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/PropertyHandlerFactory.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/PropertyHandlerFactory.java
@@ -2,11 +2,12 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
 
 /*
  * Maps the propertyvalue type to a PropertyHandler
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/ShortHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/ShortHandler.java
index 86676c7..6b81a0d 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/ShortHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/ShortHandler.java
@@ -2,8 +2,6 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
-
 class ShortHandler extends BuiltinTypeHandler<Short> {
     public ShortHandler(String propertyName, MetaMethod getter, MetaMethod setter) {
         super(Short.class, propertyName, getter, setter);
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/StringHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/StringHandler.java
index 8fb3460..cc4c3bf 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/StringHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/StringHandler.java
@@ -2,8 +2,6 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
-
 class StringHandler extends BuiltinTypeHandler<String> {
     public StringHandler(String propertyName, MetaMethod getter, MetaMethod setter) {
         super(String.class, propertyName, getter, setter);
diff --git a/lib/src/main/java/com/github/shautvast/contiguous/TypeHandler.java b/lib/src/main/java/com/github/shautvast/contiguous/TypeHandler.java
index 2735a35..4a5582c 100644
--- a/lib/src/main/java/com/github/shautvast/contiguous/TypeHandler.java
+++ b/lib/src/main/java/com/github/shautvast/contiguous/TypeHandler.java
@@ -2,8 +2,6 @@ package com.github.shautvast.contiguous;
 
 import com.github.shautvast.reflective.MetaMethod;
 
-import java.lang.invoke.MethodHandle;
-
 /**
  * Abstract basetype over handlers for 'primitives' (ie. long, but also Long,
  * String..=> built-in types) and compound types (your own).