Removing requiring JDK1.7