Removed jdk8 imports