Replace Deencapsulation with direct calls to now static methods