Go back to Java 6 code compliance to ease IDE setup