Remove Java 8 lambda syntax