removed  Java 1.7 code