Remove Java 8 dependencies