Removed Java 1.8 dependencies