enum cleanup