Remove Java 7 features