Removings some more Java 7 support