Removed Java 7 Dependency