clean up. Java 6+ updates.