Remove commented out code in Hierarchy