delete client implemented
one more implemented
Merge branch 'release/sprint2'