Cleaning up hierarchy