Switch to Java 1.6
Clean up
new stuff in interop