More java8 cleanup