remove dependency on Java 1.7