Cleaning up shop and object hierarchies