Removed Java 7 dependency