Removed subelements
Cleanup raw memory logic