minor cleanup in share and user areas