Clean up
Merge pull request #5029 from ianna/remove-singleton-friend

Clean up DDRoot