MDS Cleanup - memory management