cleanup and preparing java8