Enumeration cleanup