[Users]: cleanup
Merge branch 'master' of https://github.com/jaws-project/jaws