Added removing on shared users and some fixes