Issue #136. Fixed deleting of the orphaned items.