Well, it's not entirely done, for example I still don't really parse addresses (but c'mon! who's gonna publish their real address in jabber!) nor I keep them across vCard update. The gui for vCard emails and phone numbers may be not the best, but I believe it's enough for now
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?