Include alternate addresses
Remove unneeded field