some clean up, publishing selected users added
Merge branch 'clean-client-server' into devel