Remove useless dependancy to java.util.Enumeration