Removed HashMap and HashSet (fixes #62)