Remove jdk7 dependency