Minor edits/simplifications to user delete workflow