Removing jdk6 compatybility