clean up + move to java1.8