Remove JAVA 7 dependances