Some additional protection for items where the source has been deleted.
Better cleaning of items when source material is deleted.