Clean up Descendants and SelfDescendants