Merging User.Remove into UserModel Refactor