Removed unused code.
Changed the java version.