Removed Java 8 specific code