Updated to Java 1.8 Lambda syntax, removed unnecessary methods