Delete client
Merge branch 'dev'