Remove JDK 7 code