Cleaned hierarchy (the domain contained some references to infrastructures)