Removed DML references to removed Enums