Dtor changes to deal with world_factory object and contents