remove a java option and some cleanups