Move hierarchy to traversable
Get rid of remaining observer code