Remove redundant enums now that we have the technology