Use java 8
Some more cleanup