use java 6, cleanup