Java 7 cleanup