Removed more Enum'