enumeration cleanup