Remove user (rebased onto develop)



This is the same as gh-2100 but rebased onto develop.

----

To test
* add a user
* remove user. Make sure data are removed.