JDK8 cleanups