Remove unused code
Merge pull request #5036 from ianna/remove-unused-hierarchy-utils

Remove unused code