Removed JDK8 dependencies