Clean up enumerations