Remove dependency on jdk1.8