Remove java8 stuff