Java 7 cleanup
Java 7 cleanup