removed lines that required a feature of Java 7