removing java 8 code