Remove enums not needed anymore