Removing java 8 stuff for now