Remove Java8'ism