Removed crap from hierarchy