Removed Java 7-isms