clean up to allow Java 6 build target