refactor delete method
fix bug
Merge pull request #113 from alberts-tid/task/CLAUDIA-4358

Task/claudia 4358