Hierarchy cleaned