Getting rid of Java 8