Comment some code to use java 8