Removed deprecated enums