removed java 8 stuff