Remove Java 7 syntax. Set target version back to 1.6.