remove java 8 code