Removal of unused imports
Update for consistency (all other enums are using _ in between words)