Removed dep on JDK8.