Remove Java8 code