Removed Java 8 code