java version fix and remove CVS files