Remove some unnecessary enums