Removed use of Java 8 class