fixed removal of users from watchers/watching, will no longer delete the user
changed delete user to remove watcher.