Resolves: #247215
    Summary: Reimplement ds_remove without setuputil code (comment #1)
    Description: 1) introduced delete entry operation.
    2) cleaned up check_and_add code