Cleanup and update to Java 1.7