Removing more Java 7 stuff