cleanup + revert to java 1.7