Remove Marshaling MDA (#22579)