Removed outstanding config and dependency on Java 7.