completed delete friends
Merge in deleteFriends branch.