cleanup to enums