Revert 179491 due to performance regression.

BUG=173243

> Use WebInputElement.isCheckbox() and isRadioButton() API being exposed by https://bugs.webkit.org/show_bug.cgi?id=108031
> 
> BUG=157636
> 
> 
> Review URL: https://chromiumcodereview.appspot.com/12084024

TBR=ramankk@chromium.org
Review URL: https://codereview.chromium.org/12096074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179755 0039d316-1c4b-4281-b951-d872f2087c98

58 files changed, 2 insertions, 197 deletions

diff --git a/chrome/test/data/autofill/heuristics/output/02_checkout_advanceautoparts.com.out b/chrome/test/data/autofill/heuristics/output/02_checkout_advanceautoparts.com.out
index 80b1077..5b826ea 100644
--- a/chrome/test/data/autofill/heuristics/output/02_checkout_advanceautoparts.com.out
+++ b/chrome/test/data/autofill/heuristics/output/02_checkout_advanceautoparts.com.out
@@ -1,4 +1,3 @@
-UNKNOWN_TYPE | billingShippingSame | Billing AddressUse form below for your billing address:* required fields*First Name: | false
 NAME_FIRST | billFirstName | *First Name: | 
 NAME_LAST | billLastName | *Last Name: | 
 ADDRESS_BILLING_LINE1 | billAddress1 | *Street Address 1: | 
@@ -10,7 +9,6 @@ PHONE_HOME_CITY_CODE | billDayPhonePart1 | ( |
 PHONE_HOME_NUMBER | billDayPhonePart2 | ) | 
 PHONE_HOME_NUMBER | billDayPhonePart3 | *Day Phone: | 
 EMAIL_ADDRESS | billEmail | *Email Address: | 
-UNKNOWN_TYPE | sendMeEmail | *Email Address: | checked
 NAME_FIRST | shipFirstName | *First Name: | 
 NAME_LAST | shipLastName | *Last Name: | 
 ADDRESS_HOME_LINE1 | shipAddress1 | *Street Address 1: | 
diff --git a/chrome/test/data/autofill/heuristics/output/02_checkout_ae.com.out b/chrome/test/data/autofill/heuristics/output/02_checkout_ae.com.out
index 7b23197..e9fa3bb 100644
--- a/chrome/test/data/autofill/heuristics/output/02_checkout_ae.com.out
+++ b/chrome/test/data/autofill/heuristics/output/02_checkout_ae.com.out
@@ -10,9 +10,6 @@ ADDRESS_HOME_LINE2 | address2 | Address |
 ADDRESS_HOME_CITY | city | City | 
 ADDRESS_HOME_STATE | state | State | 
 ADDRESS_HOME_ZIP | zip | Zip | 
-UNKNOWN_TYPE | shippingChoice | Shipping Method CLOSEWe ship using UPS and USPS Priority Mail within the continental United States, and USPS priority mail outside of the continental United States.Learn More about our shipping methods and prices.Place this order by 1PM EST to get it by the estimated dates below: | Standard
-UNKNOWN_TYPE | shippingChoice | Shipping Method CLOSEWe ship using UPS and USPS Priority Mail within the continental United States, and USPS priority mail outside of the continental United States.Learn More about our shipping methods and prices.Place this order by 1PM EST to get it by the estimated dates below: | SecondDay
-UNKNOWN_TYPE | shippingChoice | Standard3 - 7 business days$7dates: Jun 08 - Jun 14 Two Day2 business days$15date: Jun 07 Overnight1 business day$20date: Jun 06 | Overnight
 CREDIT_CARD_TYPE | ccType | Card Type: | 
 CREDIT_CARD_NUMBER | ccNumber | Card Number: | 
 CREDIT_CARD_EXP_MONTH | expMonth | Expiration: | 1
@@ -22,10 +19,7 @@ UNKNOWN_TYPE | birthMonthBMLField | Birthday: CLOSEWe need your birthday for the
 UNKNOWN_TYPE | birthDayBMLField | Birthday: CLOSEWe need your birthday for the Bill Me Later® credit check process. | 
 UNKNOWN_TYPE | birthYearBMLField | Birthday: CLOSEWe need your birthday for the Bill Me Later® credit check process. | 
 UNKNOWN_TYPE | SSN | Last 4 digits of your social security #: CLOSEWe need the last 4 digits of your SSN for the Bill Me Later® credit check process. If you do not have an SSN, you can still pay by Credit Card or PayPal. | 
-UNKNOWN_TYPE | agree | I agree to have the Terms and Conditions presented electronically. | yes
-UNKNOWN_TYPE | agreeTs | I agree to the Bill Me Later® Terms and Conditions. | yes
 ADDRESS_HOME_COUNTRY | countryType | Country Type | usa
-UNKNOWN_TYPE | billSameAsShip | My Billing & Shipping addresses are the same | yes
 ADDRESS_HOME_COUNTRY | country | Country, APO/FPO | US
 NAME_FIRST | firstName | First Name | 
 NAME_LAST | lastName | Last Name | 
@@ -38,12 +32,6 @@ EMAIL_ADDRESS | email | Email CLOSEWe use this to send you an order confirmation
 EMAIL_ADDRESS | confirmEmail | Re-Type Email | 
 PHONE_HOME_WHOLE_NUMBER | billingPhone | Billing Phone Number CLOSEThis must match the phone number on your credit card statement. Don't worry... we never share your number with anyone. | 
 UNKNOWN_TYPE | accessPassNumber | My AEREWARD$ # CLOSEAEREWARD$ NumberEnter the number found on the back of your AEREWARD$ card to earn rewards for your purchase.Learn More about AEREWARD$ | 
-UNKNOWN_TYPE | aeRewardsSignUp | Sign up now and receive 25 points  just for signing up! Learn More | true
-UNKNOWN_TYPE | aeAccount | Create my AE Account.CLOSECreate an AE Account to:Save Your Personal Info For Next TimeCheckout FasterTrack An Order Quicker Sign up now and receive 25 points just for signing up! Learn More | true
 UNKNOWN_TYPE | birthMonthBillAddField | Birthday: CLOSEWe'd love to wish you a happy birthday when it's time! However, you need to be 13 or older to create an account. | 
 UNKNOWN_TYPE | birthDayBillAddField | Birthday: CLOSEWe'd love to wish you a happy birthday when it's time! However, you need to be 13 or older to create an account. | 
 UNKNOWN_TYPE | birthYearBillAddField | Birthday: CLOSEWe'd love to wish you a happy birthday when it's time! However, you need to be 13 or older to create an account. | 
-UNKNOWN_TYPE | aeEmail | AE | on
-UNKNOWN_TYPE | aerieEmail | aerie | on
-UNKNOWN_TYPE | kidsEmail | 77kids | on
-UNKNOWN_TYPE | loyaltyTerms | I accept the Terms & Conditions | 
diff --git a/chrome/test/data/autofill/heuristics/output/02_checkout_bedbathandbeyond.com.out b/chrome/test/data/autofill/heuristics/output/02_checkout_bedbathandbeyond.com.out
index 58d3631..af6cf0b 100644
--- a/chrome/test/data/autofill/heuristics/output/02_checkout_bedbathandbeyond.com.out
+++ b/chrome/test/data/autofill/heuristics/output/02_checkout_bedbathandbeyond.com.out
@@ -18,9 +18,6 @@ PHONE_HOME_NUMBER | mob_phone_part2 | Mobile phone |
 PHONE_HOME_NUMBER | mob_phone_part3 | Mobile phone | 
 EMAIL_ADDRESS | email_addr | *Email | 
 EMAIL_ADDRESS | retype_email_addr | *Re-type email | 
-UNKNOWN_TYPE | promo_email_flag | Receive information on special offers and new arrivals at Bed Bath & Beyond. | Y
-UNKNOWN_TYPE | mobile_offers_opt_in | Bed Bath & Beyond may deliver mobile offers and promotions via text message in the future. Check the box if you would like to receive these mobile offers and promotions on your mobile phone. View our Privacy policy. Message & data rates may apply. | Y
-UNKNOWN_TYPE | shipping_options | Shipping | B
 NAME_FIRST | ship_first_nm | *First name | 
 NAME_MIDDLE | ship_mid_nm | Middle name | 
 NAME_LAST | ship_last_nm | *Last name | 
diff --git a/chrome/test/data/autofill/heuristics/output/02_checkout_cafepress.com.out b/chrome/test/data/autofill/heuristics/output/02_checkout_cafepress.com.out
index ca0c74d..4683755 100644
--- a/chrome/test/data/autofill/heuristics/output/02_checkout_cafepress.com.out
+++ b/chrome/test/data/autofill/heuristics/output/02_checkout_cafepress.com.out
@@ -9,9 +9,6 @@ UNKNOWN_TYPE | BillStateOther | State/Province* |
 ADDRESS_BILLING_ZIP | BillZip | Zip/Postal Code* | 
 PHONE_HOME_WHOLE_NUMBER | BillPhone | Phone Number* | 
 EMAIL_ADDRESS | BillEmail | Email Address* | 
-UNKNOWN_TYPE | cbStoreSpecial |  | on
-UNKNOWN_TYPE | ShipDestination |  | billaddress
-UNKNOWN_TYPE | ShipDestination | Ship to my billing address | shipaddress
 NAME_FULL | ShipName | Recipient Name* | 
 ADDRESS_HOME_COUNTRY | ShipCountry | Country* | UNITED STATES
 ADDRESS_HOME_LINE1 | ShipStreet1 | Address* | 
@@ -20,16 +17,8 @@ ADDRESS_HOME_CITY | ShipCity | Town/City* |
 ADDRESS_HOME_STATE | ShipState | State/Province* | 
 UNKNOWN_TYPE | ShipStateOther | State/Province* | 
 ADDRESS_HOME_ZIP | ShipZip | Zip/Postal Code* | 
-UNKNOWN_TYPE | ShowGiftMsg | 2 Shipping Address | on
 UNKNOWN_TYPE | countdown | You have | 300
-UNKNOWN_TYPE | ApplyGiftWrap | 2 Shipping Address | on
 UNKNOWN_TYPE | txtCoupon | Apply Promo Code | 
-UNKNOWN_TYPE | PaymentMethod |  | PayByCafeCash
-UNKNOWN_TYPE | PaymentMethod |  | PayByGC
-UNKNOWN_TYPE | PaymentMethod |  | PayByCCGC
-UNKNOWN_TYPE | PaymentMethod |  | PayByCC
 CREDIT_CARD_NUMBER | txtCCAccount | Credit Card No.* | 
 CREDIT_CARD_EXP_MONTH | ccExp$MonthDrop | Expiration Date* | 06 (June)
 CREDIT_CARD_EXP_4_DIGIT_YEAR | ccExp$YearDrop | Expiration Date* | 2011
-UNKNOWN_TYPE | PaymentMethod | Expiration Date* | PayByCheck
-UNKNOWN_TYPE | PaymentMethod |  | PayByPayPal
diff --git a/chrome/test/data/autofill/heuristics/output/03_checkout_cduniverse.com.out b/chrome/test/data/autofill/heuristics/output/03_checkout_cduniverse.com.out
index b5e2157..5017bf3 100644
--- a/chrome/test/data/autofill/heuristics/output/03_checkout_cduniverse.com.out
+++ b/chrome/test/data/autofill/heuristics/output/03_checkout_cduniverse.com.out
@@ -15,6 +15,3 @@ ADDRESS_HOME_CITY | HT_Ship_City | City |
 ADDRESS_HOME_STATE | HT_Ship_State | State/Province | 
 ADDRESS_HOME_ZIP | HT_Ship_Zip | Zip/Postal Code | 
 ADDRESS_HOME_COUNTRY | HT_Ship_Country | Country | 
-UNKNOWN_TYPE | HT_OK_to_email | Would it be OK if occasionally we notified you of special sales via email? | -1
-UNKNOWN_TYPE | HT_OK_to_email | Yes | 0
-UNKNOWN_TYPE | HT_PrefersHTML | Would it be OK if occasionally we notified you of special sales via email? | on
diff --git a/chrome/test/data/autofill/heuristics/output/03_checkout_crutchfield.com.out b/chrome/test/data/autofill/heuristics/output/03_checkout_crutchfield.com.out
index 3891038..10d6512 100644
--- a/chrome/test/data/autofill/heuristics/output/03_checkout_crutchfield.com.out
+++ b/chrome/test/data/autofill/heuristics/output/03_checkout_crutchfield.com.out
@@ -8,9 +8,6 @@ ADDRESS_HOME_STATE | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$s
 ADDRESS_HOME_ZIP | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$zip | Zip/Postal Code | 
 PHONE_HOME_WHOLE_NUMBER | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$billphone2 | Billing Phone | 
 EMAIL_ADDRESS | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$email2 | Email | 
-UNKNOWN_TYPE | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$chbox2 | Send me exclusive offers, deals and expert reviews. | on
-UNKNOWN_TYPE | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$same | Shipping Address | same
-UNKNOWN_TYPE | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$giftOrder | Shipping Address | gift
 NAME_FIRST | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingFirstname | First Name | 
 NAME_MIDDLE_INITIAL | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingMi | M.I. | 
 NAME_LAST | ctl00$ctl00$MainContentPlaceHolder$MainContentPlaceHolder$shippingLastname | Last Name | 
diff --git a/chrome/test/data/autofill/heuristics/output/03_checkout_gamestop.com.out b/chrome/test/data/autofill/heuristics/output/03_checkout_gamestop.com.out
index c2d2d13..f327e63 100644
--- a/chrome/test/data/autofill/heuristics/output/03_checkout_gamestop.com.out
+++ b/chrome/test/data/autofill/heuristics/output/03_checkout_gamestop.com.out
@@ -10,7 +10,6 @@ ADDRESS_HOME_COUNTRY | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlace
 PHONE_HOME_WHOLE_NUMBER | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$textPhoneNumberDaytime | Phone Number: | 
 EMAIL_ADDRESS | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$txtEmailAddress | Purchaser's Email: | 
 EMAIL_ADDRESS | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$txtEmailAddressConfirm | Confirm Email: | 
-UNKNOWN_TYPE | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$AddressDetails$AddressDetails$chkEmailOptIn | Confirm Email: | on
 NAME_FIRST | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textFirstName | First Name: | 
 NAME_LAST | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textLastName | Last Name: | 
 ADDRESS_HOME_LINE1 | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textAddressLine1 | Address 1: | 
@@ -20,4 +19,3 @@ ADDRESS_HOME_STATE | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHo
 ADDRESS_HOME_ZIP | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textZip | Zip/Postal: | 
 ADDRESS_HOME_COUNTRY | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$ddlCountry | Country: | US
 PHONE_HOME_WHOLE_NUMBER | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$aspShippingAddress$popAddressSelection$AddressDetails1$textPhoneNumberDaytime | Phone Number: | 
-UNKNOWN_TYPE | ctl00$ctl00$ctl00$BaseContentPlaceHolder$mainContentPlaceHolder$MainContentPlaceHolder$chkSameAsBillingAddress |  | on
diff --git a/chrome/test/data/autofill/heuristics/output/03_checkout_homedepot.com.out b/chrome/test/data/autofill/heuristics/output/03_checkout_homedepot.com.out
index 9472e14..70ecb00 100644
--- a/chrome/test/data/autofill/heuristics/output/03_checkout_homedepot.com.out
+++ b/chrome/test/data/autofill/heuristics/output/03_checkout_homedepot.com.out
@@ -11,4 +11,3 @@ PHONE_HOME_NUMBER | fieldphone3_1 | *Phone Number on Record: |
 PHONE_HOME_CITY_CODE | altfieldphone1_1 | Alternate Phone: | 
 PHONE_HOME_NUMBER | altfieldphone2_1 | Alternate Phone: | 
 PHONE_HOME_NUMBER | altfieldphone3_1 | Alternate Phone: | 
-UNKNOWN_TYPE | isBillingAddress_1 | Alternate Phone: | on
diff --git a/chrome/test/data/autofill/heuristics/output/03_checkout_hsn.com.out b/chrome/test/data/autofill/heuristics/output/03_checkout_hsn.com.out
index a7c12cd..645885b 100644
--- a/chrome/test/data/autofill/heuristics/output/03_checkout_hsn.com.out
+++ b/chrome/test/data/autofill/heuristics/output/03_checkout_hsn.com.out
@@ -1,4 +1,3 @@
-UNKNOWN_TYPE | Body$BillingIsShippingCheckboxB | Enter billing information (as it appears on your statement) | on
 NAME_FIRST | Body$BillingAddress$_firstName | First Name | 
 NAME_LAST | Body$BillingAddress$_lastName | Last Name | 
 ADDRESS_BILLING_LINE1 | Body$BillingAddress$_address1 | Address Line 1 | 
@@ -7,17 +6,8 @@ ADDRESS_BILLING_CITY | Body$BillingAddress$_city | City |
 ADDRESS_BILLING_STATE | Body$BillingAddress$_state | State |   
 ADDRESS_BILLING_ZIP | Body$BillingAddress$_zipcode | Zip Code | 
 PHONE_HOME_WHOLE_NUMBER | Body$BillingAddress$_PrimaryPhone | Primary Phone | 
-UNKNOWN_TYPE | Body$BillingAddress$rdoPrimary |  | H
-UNKNOWN_TYPE | Body$BillingAddress$rdoPrimary |  | M
-UNKNOWN_TYPE | Body$BillingAddress$rdoPrimary |  | W
 PHONE_HOME_WHOLE_NUMBER | Body$BillingAddress$_Alt1Phone | Alternate Phone2(optional) | 
-UNKNOWN_TYPE | Body$BillingAddress$rdoAlt1 |  | H
-UNKNOWN_TYPE | Body$BillingAddress$rdoAlt1 |  | M
-UNKNOWN_TYPE | Body$BillingAddress$rdoAlt1 |  | W
-UNKNOWN_TYPE | Body$MobileAlerts | Enter billing information (as it appears on your statement) | on
 EMAIL_ADDRESS | Body$NewEmailAddress2 | Email Address | 
-UNKNOWN_TYPE | Body$WeeklyNewsletterSignup12 | Email Address | on
-UNKNOWN_TYPE | Body$TSNewsletterSignup2 | Email Address | on
 NAME_FIRST | Body$ShippingAddress$_firstName | First Name | 
 NAME_LAST | Body$ShippingAddress$_lastName | Last Name | 
 ADDRESS_HOME_LINE1 | Body$ShippingAddress$_address1 | Address Line 1 | 
@@ -26,13 +16,8 @@ ADDRESS_HOME_CITY | Body$ShippingAddress$_city | City |
 ADDRESS_HOME_STATE | Body$ShippingAddress$_state | State |   
 ADDRESS_HOME_ZIP | Body$ShippingAddress$_zipcode | Zip Code | 
 PHONE_HOME_WHOLE_NUMBER | Body$ShippingAddress$_telephone | Phone Number | 
-UNKNOWN_TYPE | PaymentTypeSelection |  | 0
 CREDIT_CARD_NUMBER | Body$CCNumber | Card Number | 
 CREDIT_CARD_EXP_MONTH | Body$CCExpirationDateMonth | Expiration Date | 0
 CREDIT_CARD_EXP_4_DIGIT_YEAR | Body$CCExpirationDateYear | Expiration Date | 0
 CREDIT_CARD_NAME | Body$CCNameOnCard | Name on Card | 
-UNKNOWN_TYPE | IsDebitCard | Is this a Debit Card? | 1
-UNKNOWN_TYPE | IsDebitCard | Yes | 0
-UNKNOWN_TYPE | Body$SaveCC4Later | Is this a Debit Card? | on
-UNKNOWN_TYPE | PaymentTypeSelection | OR | 1
 UNKNOWN_TYPE | Body$NewPasswordHint | Password Hint (optional) | 
diff --git a/chrome/test/data/autofill/heuristics/output/04_checkout_jr.com.out b/chrome/test/data/autofill/heuristics/output/04_checkout_jr.com.out
index 4b105bb..acdb256 100644
--- a/chrome/test/data/autofill/heuristics/output/04_checkout_jr.com.out
+++ b/chrome/test/data/autofill/heuristics/output/04_checkout_jr.com.out
@@ -8,9 +8,6 @@ ADDRESS_BILLING_ZIP | billingAddress.postalCode | * |
 ADDRESS_BILLING_COUNTRY | billingAddress.country | * | US
 PHONE_HOME_WHOLE_NUMBER | billingAddress.phoneNumber | * | 
 EMAIL_ADDRESS | customer.emailAddress | * | 
-UNKNOWN_TYPE | customer.optIn | Yes, send me J&R's promotional email newsletter. | on
-UNKNOWN_TYPE | storePickup | Pickup In-Store (Park Row, New York NY) | on
-UNKNOWN_TYPE | shipToBillingAddress | Ship to my billing address | on
 NAME_FIRST | shippingAddress.firstName | * | 
 NAME_LAST | shippingAddress.lastName | * | 
 ADDRESS_HOME_LINE1 | shippingAddress.address1 | * | 
@@ -25,4 +22,3 @@ UNKNOWN_TYPE | customOrderHeader.salespersonNumber | Salesperson Number |
 UNKNOWN_TYPE | customOrderHeader.giftFromName | Gift From | 
 UNKNOWN_TYPE | customOrderHeader.giftMessage | Gift Message | 
 EMAIL_ADDRESS | customOrderHeader.giftEmailAddress | Gift Email | 
-UNKNOWN_TYPE | customOrderHeader.giftHidePrices | Hide prices on the recipient's invoice and products on gift email. | on
diff --git a/chrome/test/data/autofill/heuristics/output/04_checkout_kohls.com.out b/chrome/test/data/autofill/heuristics/output/04_checkout_kohls.com.out
index 4e6cca0..bfd1f7f 100644
--- a/chrome/test/data/autofill/heuristics/output/04_checkout_kohls.com.out
+++ b/chrome/test/data/autofill/heuristics/output/04_checkout_kohls.com.out
@@ -10,9 +10,6 @@ PHONE_HOME_NUMBER | BILL_PHONE<>exchange | Exchange |
 UNKNOWN_TYPE | BILL_PHONE<>extension | Extension | 
 PHONE_HOME_WHOLE_NUMBER | bill_phone | Contact Phone: | 
 EMAIL_ADDRESS | CURRENT_USER<>email | E-mail Address: | 
-UNKNOWN_TYPE | EMAIL_OPT_STATUS_ARRAY<>opt_status | Yes, sign me up for Sale Alerts. (optional) | true
-UNKNOWN_TYPE | indShipIsBillTo | Yes | true
-UNKNOWN_TYPE | indShipIsBillTo | Yes No | false
 NAME_FIRST | SHIP_TO_ADDRESS<>firstName | First Name: | 
 NAME_LAST | SHIP_TO_ADDRESS<>lastName | Last Name: | 
 ADDRESS_HOME_LINE1 | SHIP_TO_ADDRESS<>address1 | Address: | 
diff --git a/chrome/test/data/autofill/heuristics/output/04_checkout_lowes.com.out b/chrome/test/data/autofill/heuristics/output/04_checkout_lowes.com.out
index 3286920..71d7185 100644
--- a/chrome/test/data/autofill/heuristics/output/04_checkout_lowes.com.out
+++ b/chrome/test/data/autofill/heuristics/output/04_checkout_lowes.com.out
@@ -9,10 +9,9 @@ ADDRESS_HOME_CITY | city | City: |
 ADDRESS_HOME_STATE | state | State: | 
 ADDRESS_HOME_ZIP | zipCode | ZIP Code: | 
 ADDRESS_HOME_CITY | taxGeoCode | Municipality: As an additional way to make sure you receive your order, we ask that you select the name of your municipality (city, town, borough, village, etc.) followed by the county, township, or parish in which you reside. | 
-UNKNOWN_TYPE | billingAddress | Please enter the phone number and e-mail address associated with this billing address.E-mail Address: Contact Phone: | on
 EMAIL_ADDRESS | email1 | E-mail Address: | 
 PHONE_HOME_CITY_CODE | billphone1 | Contact Phone: | 
 PHONE_HOME_NUMBER | billphone2 | Contact Phone: | 
 PHONE_HOME_NUMBER | billphone3 | Contact Phone: | 
-EMAIL_ADDRESS | selfAddress | Please enter the phone number and e-mail address associated with this billing address.E-mail Address: Contact Phone: | 0
+EMAIL_ADDRESS | selfAddress | This is also my billing address. Please enter the phone number and e-mail address associated with this billing address.E-mail Address: Contact Phone: | 0
 UNKNOWN_TYPE | save-address |  | on
diff --git a/chrome/test/data/autofill/heuristics/output/05_checkout_macys.com.out b/chrome/test/data/autofill/heuristics/output/05_checkout_macys.com.out
index af9430e..4debb59 100644
--- a/chrome/test/data/autofill/heuristics/output/05_checkout_macys.com.out
+++ b/chrome/test/data/autofill/heuristics/output/05_checkout_macys.com.out
@@ -1,4 +1,3 @@
-UNKNOWN_TYPE | selectedShippingAddress | Add a new shipping address | newAddress
 NAME_FIRST | currentShipment.shipmentAddress.firstName | First Name: | 
 NAME_LAST | currentShipment.shipmentAddress.lastName | Last Name: | 
 ADDRESS_HOME_LINE1 | currentShipment.shipmentAddress.address1 | Address: | 
diff --git a/chrome/test/data/autofill/heuristics/output/05_checkout_nordstrom.com.out b/chrome/test/data/autofill/heuristics/output/05_checkout_nordstrom.com.out
index 682d075..ed9bf04ba 100644
--- a/chrome/test/data/autofill/heuristics/output/05_checkout_nordstrom.com.out
+++ b/chrome/test/data/autofill/heuristics/output/05_checkout_nordstrom.com.out
@@ -10,7 +10,6 @@ ADDRESS_BILLING_CITY | ctl00$mainContentPlaceHolder$billingAddressForm$city | Ci
 ADDRESS_BILLING_STATE | ctl00$mainContentPlaceHolder$billingAddressForm$stateProvince | State/Province | -1
 ADDRESS_BILLING_ZIP | ctl00$mainContentPlaceHolder$billingAddressForm$zipCode | Zip/Postal Code | 
 ADDRESS_BILLING_COUNTRY | ctl00$mainContentPlaceHolder$billingAddressForm$country | Country | 249
-UNKNOWN_TYPE | ctl00$mainContentPlaceHolder$shippingSameAsBilling |  | on
 NAME_FIRST | ctl00$mainContentPlaceHolder$shippingAddressForm$firstName | First Name | 
 NAME_MIDDLE_INITIAL | ctl00$mainContentPlaceHolder$shippingAddressForm$middleInitial | M.I. | 
 NAME_LAST | ctl00$mainContentPlaceHolder$shippingAddressForm$lastName | Last Name | 
diff --git a/chrome/test/data/autofill/heuristics/output/05_checkout_officemax.com.out b/chrome/test/data/autofill/heuristics/output/05_checkout_officemax.com.out
index 5d460a1..5c468cb 100644
--- a/chrome/test/data/autofill/heuristics/output/05_checkout_officemax.com.out
+++ b/chrome/test/data/autofill/heuristics/output/05_checkout_officemax.com.out
@@ -9,6 +9,5 @@ ADDRESS_HOME_ZIP | zip | *Zip Code: |
 PHONE_HOME_WHOLE_NUMBER | phone | *Phone number: | 
 EMAIL_ADDRESS | /atg/commerce/order/purchase/ShippingGroupFormHandler.emailAddress | *Email Address: | 
 EMAIL_ADDRESS | /atg/commerce/order/purchase/ShippingGroupFormHandler.confirmEmailAddress | *Confirm Email Address: | 
-UNKNOWN_TYPE | emailOptIn | Yes! Send me exclusive coupons and special online savings via OfficeMax email.OfficeMax is committed to safeguarding your privacy. Our Privacy Policy outlines how OfficeMax handles your information. | https://www.officemax.com:443/
 UNKNOWN_TYPE | /atg/commerce/order/purchase/ShippingGroupFormHandler.maxPerksNumber | MaxPerks® ID: < What is this? | 
 UNKNOWN_TYPE | TaxExemptID | Tax Exempt ID: < What is this? | 
diff --git a/chrome/test/data/autofill/heuristics/output/05_checkout_overstock.com.out b/chrome/test/data/autofill/heuristics/output/05_checkout_overstock.com.out
index bc119ff..5912be0 100644
--- a/chrome/test/data/autofill/heuristics/output/05_checkout_overstock.com.out
+++ b/chrome/test/data/autofill/heuristics/output/05_checkout_overstock.com.out
@@ -7,8 +7,6 @@ ADDRESS_BILLING_STATE | BillingState | State | CA
 ADDRESS_BILLING_ZIP | BillingZipCode | Zip | 95014
 PHONE_HOME_WHOLE_NUMBER | BillingDaytimePhone | Day Phone | 4088737223
 PHONE_HOME_WHOLE_NUMBER | BillingEveningPhone | Evening Phone | 
-UNKNOWN_TYPE | checkbox2 | *Required Field | on
-UNKNOWN_TYPE | diffShip | *Required Field | on
 NAME_FIRST | ShippingFirstName | First Name | 
 NAME_LAST | ShippingLastName | Last Name | 
 ADDRESS_HOME_LINE1 | lineone | Address Line 1 | 7540 Donegal Dr
@@ -18,15 +16,10 @@ ADDRESS_HOME_CITY | city | City | Cupertino
 ADDRESS_HOME_STATE | state | State | CA
 ADDRESS_HOME_ZIP | zip | Zip | 95014
 UNKNOWN_TYPE | product6496917 | Black-plated Tungsten Carbide Comfort Fit Band (8 mm) Options: 10 1 | GROUND6496917
-UNKNOWN_TYPE | CC |  | CreditCardValue
 CREDIT_CARD_NUMBER | CC_number | Credit Card #: | 
 CREDIT_CARD_EXP_MONTH | exp_month | Expiration Date: | 0
 CREDIT_CARD_EXP_4_DIGIT_YEAR | exp_year | Expiration Date: | 
-UNKNOWN_TYPE | CC |  | PayPal
-UNKNOWN_TYPE | CC |  | bml
-UNKNOWN_TYPE | UsePromoCode | See Terms | on
 UNKNOWN_TYPE | PromoCode | See Terms | 
-UNKNOWN_TYPE | UseGiftCards | See Terms | on
 UNKNOWN_TYPE | GiftCardNumber0 | Gift Card 1: | 
 UNKNOWN_TYPE | PINNumber0 | PIN: | 
 UNKNOWN_TYPE | GiftCardNumber1 | Gift Card 2: | 
diff --git a/chrome/test/data/autofill/heuristics/output/05_checkout_petco.com.out b/chrome/test/data/autofill/heuristics/output/05_checkout_petco.com.out
index 116ec69..ed7e6cc 100644
--- a/chrome/test/data/autofill/heuristics/output/05_checkout_petco.com.out
+++ b/chrome/test/data/autofill/heuristics/output/05_checkout_petco.com.out
@@ -1,7 +1,6 @@
 NAME_FIRST | ctl00$ctl00$cphBody$cphBody$txtSA_FirstName | First Name * | 
 NAME_LAST | ctl00$ctl00$cphBody$cphBody$txtSA_LastName | Last Name * | 
 ADDRESS_HOME_LINE1 | ctl00$ctl00$cphBody$cphBody$txtSA_Address1 | Address Line 1 * | 
-UNKNOWN_TYPE | ctl00$ctl00$cphBody$cphBody$cbSA_IsPOBox | P.O. Box | on
 ADDRESS_HOME_LINE2 | ctl00$ctl00$cphBody$cphBody$txtSA_Address2 | Address Line 2 | 
 ADDRESS_HOME_CITY | ctl00$ctl00$cphBody$cphBody$txtSA_City | City * | 
 ADDRESS_HOME_STATE | ctl00$ctl00$cphBody$cphBody$ddlSA_State | State * | 
@@ -10,5 +9,3 @@ PHONE_HOME_CITY_CODE | ctl00$ctl00$cphBody$cphBody$txtSA_Phone1 | Phone Number *
 PHONE_HOME_NUMBER | ctl00$ctl00$cphBody$cphBody$txtSA_Phone2 | ZIP Code * | 
 PHONE_HOME_NUMBER | ctl00$ctl00$cphBody$cphBody$txtSA_Phone3 | ZIP Code * | 
 UNKNOWN_TYPE | ctl00$ctl00$cphBody$cphBody$txtSA_PhoneExt | Ext. | 
-UNKNOWN_TYPE | ctl00$ctl00$cphBody$cphBody$cbSA_MatchBilling | This is also my billing address | on
-UNKNOWN_TYPE | ctl00$ctl00$cphBody$cphBody$cbSA_EmailSignup | Send me newsletters with exclusive online discounts, special announcements and health and behavior tips for my pet. | on
diff --git a/chrome/test/data/autofill/heuristics/output/06_checkout_petsmart.com.out b/chrome/test/data/autofill/heuristics/output/06_checkout_petsmart.com.out
index fc3469e..60e27b9 100644
--- a/chrome/test/data/autofill/heuristics/output/06_checkout_petsmart.com.out
+++ b/chrome/test/data/autofill/heuristics/output/06_checkout_petsmart.com.out
@@ -9,5 +9,3 @@ UNKNOWN_TYPE | altBillState | • Other State/Province: |
 ADDRESS_BILLING_ZIP | billZip | • Zip/Postal Code: | 
 PHONE_HOME_WHOLE_NUMBER | billPhone | • Telephone: | 
 EMAIL_ADDRESS | guestEmail | • Email Address: | 
-UNKNOWN_TYPE | shipOptions | Enter Addresses | useShip
-UNKNOWN_TYPE | shipOptions | Ship to the above billing address Ship to a different address | provideNew
diff --git a/chrome/test/data/autofill/heuristics/output/06_checkout_qvc.com.out b/chrome/test/data/autofill/heuristics/output/06_checkout_qvc.com.out
index f0f8e58..165b652 100644
--- a/chrome/test/data/autofill/heuristics/output/06_checkout_qvc.com.out
+++ b/chrome/test/data/autofill/heuristics/output/06_checkout_qvc.com.out
@@ -15,7 +15,6 @@ UNKNOWN_TYPE | BilltoHpExt | * Home Phone: |
 PHONE_HOME_CITY_CODE | BilltoWpArea | Work Phone: | 
 PHONE_HOME_NUMBER | BilltoWpExchange | Work Phone: | 
 UNKNOWN_TYPE | BilltoWpExt | Work Phone: | 
-UNKNOWN_TYPE | SameAsBilltoCheckbox | Same as Bill-To: | 1
 UNKNOWN_TYPE | ShiptoFirstName | * Name: | 
 ADDRESS_HOME_LINE1 | ShiptoAddress1 | * Address Line 1: | 
 ADDRESS_HOME_LINE2 | ShiptoAddress2 | Address Line 2: | 
@@ -23,5 +22,3 @@ ADDRESS_HOME_CITY | ShiptoCity | City: |
 ADDRESS_HOME_STATE | ShiptoState | State/Province: | AL
 ADDRESS_HOME_ZIP | ShiptoZipCode | * Postal Code: | 
 ADDRESS_HOME_COUNTRY | ShiptoCountry | * Country: | US
-UNKNOWN_TYPE | ShiptoRadiobutton | Use this address for: | ThisOrderOnly
-UNKNOWN_TYPE | ShiptoRadiobutton | This order only | PermanentShipto
diff --git a/chrome/test/data/autofill/heuristics/output/06_checkout_sears.com.out b/chrome/test/data/autofill/heuristics/output/06_checkout_sears.com.out
index 5fe6242..fef4cb6 100644
--- a/chrome/test/data/autofill/heuristics/output/06_checkout_sears.com.out
+++ b/chrome/test/data/autofill/heuristics/output/06_checkout_sears.com.out
@@ -1,7 +1,6 @@
 EMAIL_ADDRESS | address_email | Email* | ne00_99@yahoo.com
 NAME_FIRST | shipping_firstName | First Name* | 
 NAME_LAST | shipping_lastName | Last Name* | 
-UNKNOWN_TYPE | shipping_country | First Name* | US
 ADDRESS_HOME_LINE1 | shipping_address1 | Street Address Line 1* | 
 ADDRESS_HOME_LINE2 | shipping_address2 | Street Address Line 2 | 
 ADDRESS_HOME_CITY | shipping_city | City* | 
@@ -10,10 +9,8 @@ ADDRESS_HOME_ZIP | shipping_zipCode | ZIP Code* |
 PHONE_HOME_WHOLE_NUMBER | shipping_day1 | Phone Number* | 
 UNKNOWN_TYPE | shipping_ext1 | Ext. | 
 ADDRESS_HOME_STATE | shipping_county | County | UNKNOWN
-UNKNOWN_TYPE | billingAddressCheckBox | Same as Delivery/Shipping Address | on
 NAME_FIRST | firstName | First Name* | 
 NAME_LAST | lastName | Last Name* | 
-UNKNOWN_TYPE | country | First Name* | US
 ADDRESS_HOME_LINE1 | address1 | Street Address Line 1* | 
 ADDRESS_HOME_LINE2 | address2 | Street Address Line 2 | 
 ADDRESS_HOME_CITY | city | City* | 
diff --git a/chrome/test/data/autofill/heuristics/output/06_checkout_target.com.out b/chrome/test/data/autofill/heuristics/output/06_checkout_target.com.out
index 50ac7cd..dc38dba 100644
--- a/chrome/test/data/autofill/heuristics/output/06_checkout_target.com.out
+++ b/chrome/test/data/autofill/heuristics/output/06_checkout_target.com.out
@@ -5,6 +5,3 @@ ADDRESS_HOME_CITY | city | City*: |
 ADDRESS_HOME_STATE | state | State*: | 
 ADDRESS_HOME_ZIP | zip | Zip Code*: | 
 PHONE_HOME_WHOLE_NUMBER | voice | Phone Number*: | 
-UNKNOWN_TYPE | order.188:217866256151.ShippingSpeed | (3-5 business days) | std-us
-UNKNOWN_TYPE | order.188:217866256151.ShippingSpeed | (2 business days) | second
-UNKNOWN_TYPE | order.188:217866256151.ShippingSpeed | Standard Shipping Two-Day Shipping One-Day Shipping | next
diff --git a/chrome/test/data/autofill/heuristics/output/06_checkout_urbanoutfitters.com.out b/chrome/test/data/autofill/heuristics/output/06_checkout_urbanoutfitters.com.out
index 9d2cec1..98072ba 100644
--- a/chrome/test/data/autofill/heuristics/output/06_checkout_urbanoutfitters.com.out
+++ b/chrome/test/data/autofill/heuristics/output/06_checkout_urbanoutfitters.com.out
@@ -2,7 +2,6 @@ UNKNOWN_TYPE | shipto | Select a Saved Shipping Address |
 NAME_FIRST | shippingFirstName |  | First Name
 NAME_LAST | shippingLastName |  | Last Name
 ADDRESS_HOME_LINE1 | shippingAddress |  | Street Address
-UNKNOWN_TYPE | shippingPobox |  | true
 ADDRESS_HOME_LINE2 | shippingAddress2 |  | Apt / Flr / Bldg (optional)
 ADDRESS_HOME_CITY | shippingCity |  | City
 ADDRESS_HOME_STATE | shippingStates |  | 
@@ -10,12 +9,9 @@ ADDRESS_HOME_ZIP | shippingPostalCode |  | Postal Code
 ADDRESS_HOME_COUNTRY | shippingCountries |  | 
 PHONE_HOME_WHOLE_NUMBER | shippingPhone |  | Phone
 PHONE_HOME_WHOLE_NUMBER | altShippingPhone |  | Alternate Phone (optional)
-UNKNOWN_TYPE | billingIsShipping |  | true
-UNKNOWN_TYPE | defaultShipping |  | true
 NAME_FIRST | billingFirstName |  | First Name
 NAME_LAST | billingLastName |  | Last Name
 ADDRESS_BILLING_LINE1 | billingAddress |  | Street Address
-UNKNOWN_TYPE | billingPobox |  | true
 ADDRESS_BILLING_LINE2 | billingAddress2 |  | Apt / Flr / Bldg (optional)
 ADDRESS_BILLING_CITY | billingCity |  | City
 ADDRESS_BILLING_STATE | billingStates |  | 
@@ -23,11 +19,9 @@ ADDRESS_BILLING_ZIP | billingPostalCode |  | Postal Code
 ADDRESS_BILLING_COUNTRY | billingCountries |  | 
 PHONE_HOME_WHOLE_NUMBER | billingPhone |  | Phone
 PHONE_HOME_WHOLE_NUMBER | altBillingPhone |  | Alternate Phone (optional)
-UNKNOWN_TYPE | defaultBilling |  | true
 UNKNOWN_TYPE | savedCreditCard |  | 
 CREDIT_CARD_TYPE | payment_cardtype |  | 
 CREDIT_CARD_NUMBER | payment_acctnum |  | Card Number (no spaces or dashes)
 CREDIT_CARD_EXP_MONTH | expmonth |  | 
 CREDIT_CARD_EXP_4_DIGIT_YEAR | expyear |  | 
 CREDIT_CARD_VERIFICATION_CODE | payment_cidnew |  | CID / Security Code
-UNKNOWN_TYPE | makeDefaultCreditCard |  | true
diff --git a/chrome/test/data/autofill/heuristics/output/07_checkout_williams-sonoma.com.out b/chrome/test/data/autofill/heuristics/output/07_checkout_williams-sonoma.com.out
index 796ea41..30dc665 100644
--- a/chrome/test/data/autofill/heuristics/output/07_checkout_williams-sonoma.com.out
+++ b/chrome/test/data/autofill/heuristics/output/07_checkout_williams-sonoma.com.out
@@ -6,8 +6,5 @@ ADDRESS_HOME_STATE | shipTos[0].address.state | State* |
 ADDRESS_HOME_ZIP | shipTos[0].address.zip | Zip* | 
 PHONE_HOME_WHOLE_NUMBER | shipTos[0].address.dayPhone | Daytime Phone* | 
 PHONE_HOME_WHOLE_NUMBER | shipTos[0].address.eveningPhone | Alternate Phone | 
-UNKNOWN_TYPE | shipTos[0].billingAddressUpdate | Yes, use this shipping address for my billing address. | on
 EMAIL_ADDRESS | shipTos[0].address.emailAddr | Email* | 
 EMAIL_ADDRESS | shipTos[0].confirmEmailAddr | Confirm Email* | 
-UNKNOWN_TYPE | shipTos[0].shipType |  | Standard
-UNKNOWN_TYPE | shipTos[0].shipType | Standard (5-7 business days) Rush (2-3 business days) | Rush
diff --git a/chrome/test/data/autofill/heuristics/output/08_register_adobe.com.out b/chrome/test/data/autofill/heuristics/output/08_register_adobe.com.out
index e1bb4b6..aff2f0c 100644
--- a/chrome/test/data/autofill/heuristics/output/08_register_adobe.com.out
+++ b/chrome/test/data/autofill/heuristics/output/08_register_adobe.com.out
@@ -2,5 +2,3 @@ EMAIL_ADDRESS | adobeId | E-Mail AddressThis will be your Adobe ID |
 NAME_FIRST | firstName | First Name | 
 NAME_LAST | lastName | Last Name | 
 ADDRESS_HOME_COUNTRY | countryCode | Country | 
-UNKNOWN_TYPE | agreeToTou | I have read and agree to the and the | on
-UNKNOWN_TYPE | hostedOptIn | Yes! I would like to receive communications relating to Adobe, its products and services      including product releases, product upgrades, seminars, events, surveys, training and special offers,      and Adobe, and its agents may use data I have provided in accordance with the | on
diff --git a/chrome/test/data/autofill/heuristics/output/08_register_amazon.com.out b/chrome/test/data/autofill/heuristics/output/08_register_amazon.com.out
index f49c7e9..d8c9168 100644
--- a/chrome/test/data/autofill/heuristics/output/08_register_amazon.com.out
+++ b/chrome/test/data/autofill/heuristics/output/08_register_amazon.com.out
@@ -1,5 +1,3 @@
-UNKNOWN_TYPE | action |  | new-user
-UNKNOWN_TYPE | action | Create a new account (Recommended for Business accounts) Use existing Amazon customer account | sign-in
 UNKNOWN_TYPE | userName | First and Last Name: | 
 EMAIL_ADDRESS | email | E-mail Address: | 
 EMAIL_ADDRESS | emailCheck | Re-type E-mail Address: | 
diff --git a/chrome/test/data/autofill/heuristics/output/08_register_aol.com.out b/chrome/test/data/autofill/heuristics/output/08_register_aol.com.out
index 8afd4fe..5cd5839 100644
--- a/chrome/test/data/autofill/heuristics/output/08_register_aol.com.out
+++ b/chrome/test/data/autofill/heuristics/output/08_register_aol.com.out
@@ -5,8 +5,6 @@ UNKNOWN_TYPE | verifyPasswordHint | Password | Retype password
 UNKNOWN_TYPE | wlw-select_key:{actionForm.dobMonth} | Select Month | 
 UNKNOWN_TYPE | {actionForm.dobDay} | Select Month | Day (dd)
 UNKNOWN_TYPE | {actionForm.dobYear} | Select Month | Year (yyyy)
-UNKNOWN_TYPE | wlw-radio_button_group_key:{actionForm.gender} | Gender | Female
-UNKNOWN_TYPE | wlw-radio_button_group_key:{actionForm.gender} | Gender | Male
 ADDRESS_HOME_ZIP | {actionForm.zipCode} | Zip Code | 
 UNKNOWN_TYPE | wlw-select_key:{actionForm.acctSecurityQuestion} | Set a Security Question | 
 UNKNOWN_TYPE | {actionForm.acctSecurityAnswer} | Set a Security Question | Your Answer
diff --git a/chrome/test/data/autofill/heuristics/output/08_register_continental.com.out b/chrome/test/data/autofill/heuristics/output/08_register_continental.com.out
index 053e6ec8..5f19833 100644
--- a/chrome/test/data/autofill/heuristics/output/08_register_continental.com.out
+++ b/chrome/test/data/autofill/heuristics/output/08_register_continental.com.out
@@ -1,18 +1,10 @@
-ADDRESS_HOME_STATE | ctl00$CustomerHeader$ddlCountries | CountryClose Please select your location or where you receive credit card billing  statements to see pricing in your local currency.Available Languages: | US
-UNKNOWN_TYPE | ctl00$CustomerHeader$rdlang | Available Languages: | en-us
-UNKNOWN_TYPE | ctl00$CustomerHeader$rdlang | Available Languages: | es
-UNKNOWN_TYPE | ctl00$CustomerHeader$rdlang | Available Languages: | rd3
-UNKNOWN_TYPE | ctl00$CustomerHeader$chkSave | Save this preference | on
+ADDRESS_HOME_STATE | ctl00$CustomerHeader$ddlCountries | CountryClose Please select your location or where you receive credit card billing  statements to see pricing in your local currency.Available Languages:Save this preference | US
 UNKNOWN_TYPE | ctl00$ContentInfo$Name$cboTitle$cboTitle | Title: | 
 NAME_FIRST | ctl00$ContentInfo$Name$FName$txtFName | First Name: | 
 NAME_MIDDLE_INITIAL | ctl00$ContentInfo$Name$MName$txtMName | Middle Initial (optional): | 
 NAME_LAST | ctl00$ContentInfo$Name$LName$txtLName | Last Name: | 
 UNKNOWN_TYPE | ctl00$ContentInfo$Name$suffix$txtSuffix | Suffix (optional): | 
-UNKNOWN_TYPE | ctl00$ContentInfo$MemberAge$EnrollmentAge |  | rdoAdult
-UNKNOWN_TYPE | ctl00$ContentInfo$MemberAge$EnrollmentAge | This OnePass account is for an adult 18 years of age or older. This OnePass account is for a minor under the age of 18. | rdoMinor
 UNKNOWN_TYPE | ctl00$ContentInfo$BirthDate$txtDOB | Minor’s Date of Birth: | mm/dd/yyyy
-UNKNOWN_TYPE | ctl00$ContentInfo$AddressType$AddressType | Address Type: | rdoAddTypeHome
-UNKNOWN_TYPE | ctl00$ContentInfo$AddressType$AddressType | Home Business/Other | rdoAddTypeBusiness
 ADDRESS_HOME_LINE1 | ctl00$ContentInfo$Address$address1$txtAddress1 | Street Address: | 
 ADDRESS_HOME_LINE2 | ctl00$ContentInfo$Address$address2$txtAddress2 | Street Address: | 
 UNKNOWN_TYPE | ctl00$ContentInfo$Address$address3$txtAddress2 | Street Address: | 
@@ -28,10 +20,6 @@ UNKNOWN_TYPE | ctl00$ContentInfo$BusinessPhone$txtExt$txtPhoneExt | Ext./PIN (op
 ADDRESS_HOME_COUNTRY | ctl00$ContentInfo$BusinessPhone$cboCountry$cboCountry | Country: | US
 UNKNOWN_TYPE | ctl00$ContentInfo$HomeAirport$txtAirport | Home Airport (optional): | 
 EMAIL_ADDRESS | ctl00$ContentInfo$Email$txtEmail | E-mail Address: | 
-UNKNOWN_TYPE | ctl00$ContentInfo$chkSubOpStatement |  | on
-UNKNOWN_TYPE | ctl00$ContentInfo$chkSubopnewsoffers |  | on
-UNKNOWN_TYPE | ctl00$ContentInfo$chkSubcocomspecials |  | on
-UNKNOWN_TYPE | ctl00$ContentInfo$chkSubtripnotes |  | on
 UNKNOWN_TYPE | ctl00$ContentInfo$UsernamePassword$username$txtUsername | Username: | 
 UNKNOWN_TYPE | ctl00$ContentInfo$PINPasswordReminder$PINReminder1$txtPINReminder | PIN Reminder: (cannot include any numbers) | 
 UNKNOWN_TYPE | ctl00$ContentInfo$SecurityQuestionAnswer$Question$txtSecurity | Security Question: | 
diff --git a/chrome/test/data/autofill/heuristics/output/09_register_deviantart.com.out b/chrome/test/data/autofill/heuristics/output/09_register_deviantart.com.out
index daa7e97..5db87ae7 100644
--- a/chrome/test/data/autofill/heuristics/output/09_register_deviantart.com.out
+++ b/chrome/test/data/autofill/heuristics/output/09_register_deviantart.com.out
@@ -1,6 +1,3 @@
-UNKNOWN_TYPE | existingAccount | Are you a new customer? | 0
-UNKNOWN_TYPE | existingAccount | Are you a new customer? Create a new Buyer Account I have an existing deviantART account (email or username) | 1
 EMAIL_ADDRESS | emailAddress | Email Address | 
-UNKNOWN_TYPE | remember_me | Stay logged in | 1
 NAME_FULL | name | Full Name | 
 ADDRESS_HOME_COUNTRY | country | Country | 0
diff --git a/chrome/test/data/autofill/heuristics/output/09_register_ebay.com.out b/chrome/test/data/autofill/heuristics/output/09_register_ebay.com.out
index 4cfba51..4627851 100644
--- a/chrome/test/data/autofill/heuristics/output/09_register_ebay.com.out
+++ b/chrome/test/data/autofill/heuristics/output/09_register_ebay.com.out
@@ -19,7 +19,6 @@ UNKNOWN_TYPE | birthdate2 | Date of birth, Month | 0
 UNKNOWN_TYPE | birthdate1 | Date of birth, Day | 0
 UNKNOWN_TYPE | birthdate3 | Year of birth, four digit format. | 0
 UNKNOWN_TYPE | tokentext | For added security - opens in a new window or tab, please enter the verification code hidden in the image. | 
-UNKNOWN_TYPE | acceptq1 | I agree that:I accept the User Agreement - opens in a new window or tab and Privacy Policy.I may receive communications from eBay and can change my notification preferences in My eBay.I'm at least 18 years old. | 1
 UNKNOWN_TYPE | uword1 | Give us some word and we'll suggest some user IDs for you. Word 1 | 
 UNKNOWN_TYPE | uword2 | Word 2 | 
 UNKNOWN_TYPE | uword3 | Word 3 | 
diff --git a/chrome/test/data/autofill/heuristics/output/09_register_ecomm.dell.com.out b/chrome/test/data/autofill/heuristics/output/09_register_ecomm.dell.com.out
index d1707fe..498b239 100644
--- a/chrome/test/data/autofill/heuristics/output/09_register_ecomm.dell.com.out
+++ b/chrome/test/data/autofill/heuristics/output/09_register_ecomm.dell.com.out
@@ -7,6 +7,4 @@ ADDRESS_HOME_CITY | address$ctl00$address$addressValidator$_EditView$city | City
 ADDRESS_HOME_STATE | address$ctl00$address$addressValidator$_EditView$region$ctl01 | CityState | 
 ADDRESS_HOME_ZIP | address$ctl00$address$addressValidator$_EditView$postal_code | Zip Code4-digit Ext. | 
 UNKNOWN_TYPE | address$ctl00$address$addressValidator$_EditView$postal_code2 | Zip Code4-digit Ext. | 
-UNKNOWN_TYPE | address$ctl00$address$addressValidator$OverrideAddress | Problems? | on
 EMAIL_ADDRESS | email$ctl07 | Email Address (used to sign into your account) | 
-UNKNOWN_TYPE | Subscription |  | on
diff --git a/chrome/test/data/autofill/heuristics/output/09_register_epson.com.out b/chrome/test/data/autofill/heuristics/output/09_register_epson.com.out
index 6650d56..42fd2ef 100644
--- a/chrome/test/data/autofill/heuristics/output/09_register_epson.com.out
+++ b/chrome/test/data/autofill/heuristics/output/09_register_epson.com.out
@@ -1,4 +1,3 @@
 NAME_FIRST | fname | * First Name | 
 NAME_LAST | lname | * Last Name | 
 EMAIL_ADDRESS | emLogin | * E-mail address | 
-UNKNOWN_TYPE | wantMsg |  | on
diff --git a/chrome/test/data/autofill/heuristics/output/09_register_google.com.out b/chrome/test/data/autofill/heuristics/output/09_register_google.com.out
index 18ac19c..815f67d 100644
--- a/chrome/test/data/autofill/heuristics/output/09_register_google.com.out
+++ b/chrome/test/data/autofill/heuristics/output/09_register_google.com.out
@@ -2,8 +2,6 @@ NAME_FIRST | FirstName | First name: |
 NAME_LAST | LastName | Last name: | 
 UNKNOWN_TYPE | UsernameSelector |  | header
 EMAIL_ADDRESS | Email |  | 
-UNKNOWN_TYPE | PersistentCookie | Re-enter password: | yes
-UNKNOWN_TYPE | smhck | Re-enter password: | 1
 UNKNOWN_TYPE | selection | Security question: | choosequestion
 UNKNOWN_TYPE | ownquestion | Security question: | 
 UNKNOWN_TYPE | IdentityAnswer | Answer: | 
diff --git a/chrome/test/data/autofill/heuristics/output/10_register_gymboree.com.out b/chrome/test/data/autofill/heuristics/output/10_register_gymboree.com.out
index f42e13b..5fcbb9f 100644
--- a/chrome/test/data/autofill/heuristics/output/10_register_gymboree.com.out
+++ b/chrome/test/data/autofill/heuristics/output/10_register_gymboree.com.out
@@ -10,6 +10,3 @@ ADDRESS_HOME_STATE | LOYALTY_ADDRESS<>state_cd | State/Province* |
 ADDRESS_HOME_ZIP | LOYALTY_ADDRESS<>postal | Zip/Postal Code*! | 
 PHONE_HOME_WHOLE_NUMBER | LOYALTY_ADDRESS<>phone | Daytime Phone* | 
 UNKNOWN_TYPE | LOYALTY_ACCOUNT<>ATR_USER_Password_Hint | Password Hint* | 
-UNKNOWN_TYPE | LOYALTY_ADDRESS<>ATR_indBillAsRewards | Password Hint*! | true
-UNKNOWN_TYPE | LOYALTY_ACCOUNT<>sendEmail | Save the address above as my default billing address. I would like to receive promotions and special offers from Gymboree. | true
-UNKNOWN_TYPE | accept | I have read and accept the terms and conditions of Gymboree Rewards. (Rewards information and offers will be emailed to you.) | on
diff --git a/chrome/test/data/autofill/heuristics/output/10_register_hotels.com.out b/chrome/test/data/autofill/heuristics/output/10_register_hotels.com.out
index a651faa..5535ff7 100644
--- a/chrome/test/data/autofill/heuristics/output/10_register_hotels.com.out
+++ b/chrome/test/data/autofill/heuristics/output/10_register_hotels.com.out
@@ -12,6 +12,3 @@ ADDRESS_HOME_COUNTRY | profileInformation.customerContact.country | Country* | U
 PHONE_HOME_WHOLE_NUMBER | profileInformation.customerContact.primaryPhone | Phone number | 
 COMPANY_NAME | profileInformation.businessName | Company name | 
 UNKNOWN_TYPE | profileInformation.currency | Preferred currency | USD
-UNKNOWN_TYPE | profileInformation.customerContact.loyaltyAccountDesired | Sign me up to get 1 free night anywhere for every 10 nights I stay with Hotels.com. By enrolling, I agree to the full Terms and Conditions of the program. Learn more. | true
-UNKNOWN_TYPE | subscribeNewsletter | Email me exclusive coupons, deals and travel information from hotels.com | true
-UNKNOWN_TYPE | termsConditionsConfirm | I have read and accepted the Terms and Conditions and Privacy Policy for this website* | true
diff --git a/chrome/test/data/autofill/heuristics/output/10_register_imdb.com.out b/chrome/test/data/autofill/heuristics/output/10_register_imdb.com.out
index 886a00a..d61d001 100644
--- a/chrome/test/data/autofill/heuristics/output/10_register_imdb.com.out
+++ b/chrome/test/data/autofill/heuristics/output/10_register_imdb.com.out
@@ -1,7 +1,5 @@
 EMAIL_ADDRESS | email1 | E-mail: | 
 EMAIL_ADDRESS | email2 | Confirm E-mail: | 
-UNKNOWN_TYPE | gender | Sex: | M
-UNKNOWN_TYPE | gender | Male | F
 UNKNOWN_TYPE | year | Year of Birth: | 
 ADDRESS_HOME_ZIP | postal | ZIP/Postal Code: | 
 ADDRESS_HOME_COUNTRY | country | Country: | US
diff --git a/chrome/test/data/autofill/heuristics/output/10_register_live.com.out b/chrome/test/data/autofill/heuristics/output/10_register_live.com.out
index 8e45ebab..0675335 100644
--- a/chrome/test/data/autofill/heuristics/output/10_register_live.com.out
+++ b/chrome/test/data/autofill/heuristics/output/10_register_live.com.out
@@ -9,7 +9,4 @@ UNKNOWN_TYPE | iSQ | Question: | 0
 UNKNOWN_TYPE | iSA | Secret answer: | 
 NAME_FIRST | iFirstName | First name: | 
 NAME_LAST | iLastName | Last name: | 
-UNKNOWN_TYPE | profile_gender |  | m
-UNKNOWN_TYPE | profile_gender |  | f
 UNKNOWN_TYPE | iBirthYear | Birth year: | Example: 1990
-UNKNOWN_TYPE | iOptinEmail | Send me email with promotional offers and survey invitations from Windows Live, Bing, and MSN. (You can unsubscribe at any time.) | on
diff --git a/chrome/test/data/autofill/heuristics/output/11_register_livejournal.com.out b/chrome/test/data/autofill/heuristics/output/11_register_livejournal.com.out
index 6f1e66c..9e8ee32 100644
--- a/chrome/test/data/autofill/heuristics/output/11_register_livejournal.com.out
+++ b/chrome/test/data/autofill/heuristics/output/11_register_livejournal.com.out
@@ -4,4 +4,3 @@ UNKNOWN_TYPE | Widget[CreateAccount]_gender | Gender: |
 UNKNOWN_TYPE | Widget[CreateAccount]_bday_mm | Birthdate: | 1
 UNKNOWN_TYPE | Widget[CreateAccount]_bday_dd | Birthdate: | 
 UNKNOWN_TYPE | Widget[CreateAccount]_bday_yyyy | Birthdate: | 
-UNKNOWN_TYPE | Widget[CreateAccount]_news | Yes, send me LiveJournal announcements via email. | 1
diff --git a/chrome/test/data/autofill/heuristics/output/11_register_macys.com.out b/chrome/test/data/autofill/heuristics/output/11_register_macys.com.out
index fbdf796..1292791 100644
--- a/chrome/test/data/autofill/heuristics/output/11_register_macys.com.out
+++ b/chrome/test/data/autofill/heuristics/output/11_register_macys.com.out
@@ -9,14 +9,8 @@ UNKNOWN_TYPE | BirthMonth | Birth date | NOSELECTION
 UNKNOWN_TYPE | BirthDay |  | NOSELECTION
 UNKNOWN_TYPE | BirthYear |  | NOSELECTION
 UNKNOWN_TYPE | Gender | Gender | NOSELECTION
-UNKNOWN_TYPE | NewsLetter | We'll let you know about exclusive sales and events,both online and in-store. | NewsLetter
-UNKNOWN_TYPE | MobileMarketing | Yes, please text me about exclusive sales and events, both online and in-store. We'll send your first text message within 48 hours. | MobileMarketing
 PHONE_HOME_CITY_CODE | MobilePhoneAreaCode |  | 
 PHONE_HOME_NUMBER | MobilePhoneExchangeNbr | - | 
 PHONE_HOME_NUMBER | MobilePhoneSubscriberNbr | - | 
-UNKNOWN_TYPE | addacard | Yes, I'd like to add my Macy's Card to my profile. | on
 UNKNOWN_TYPE | MaskedAccountNumber | Macy's Account Number: | 
 UNKNOWN_TYPE | SSN4 | Last 4 digits of SSN: | 
-UNKNOWN_TYPE | addToWallet | Save this store card in your macys.com wallet for faster checkout. | addToWallet
-UNKNOWN_TYPE | emailAlert | Receive email notification when statements are ready for review andwhen payments are due. | emailAlert
-UNKNOWN_TYPE | paperStatementDelivery | I want to turn off paper statement delivery and receive my statements online. | paperStatementDelivery
diff --git a/chrome/test/data/autofill/heuristics/output/11_register_myspace.com.out b/chrome/test/data/autofill/heuristics/output/11_register_myspace.com.out
index 279c12c..0c1f23d 100644
--- a/chrome/test/data/autofill/heuristics/output/11_register_myspace.com.out
+++ b/chrome/test/data/autofill/heuristics/output/11_register_myspace.com.out
@@ -1,7 +1,3 @@
-UNKNOWN_TYPE | accountType | Account TypeWhat's this? | 2
-UNKNOWN_TYPE | accountType | Personal | 7
-UNKNOWN_TYPE | accountType | Musician | 15
-UNKNOWN_TYPE | accountType | Comedian | 9
 NAME_FIRST | tbxFirstName | First Name | 
 NAME_LAST | tbxLastName | Last Name | 
 UNKNOWN_TYPE | tbxMusicianName | Artist Name | 
@@ -11,5 +7,3 @@ EMAIL_ADDRESS | tbxEmail | Email |
 UNKNOWN_TYPE | ddlMonth | Birthday | 
 UNKNOWN_TYPE | ddlDay |  | 
 UNKNOWN_TYPE | ddlYear |  | 
-UNKNOWN_TYPE | rblGender | Gender | M
-UNKNOWN_TYPE | rblGender | Male | F
diff --git a/chrome/test/data/autofill/heuristics/output/11_register_newegg.com.out b/chrome/test/data/autofill/heuristics/output/11_register_newegg.com.out
index 924fbd3..af2f9f2 100644
--- a/chrome/test/data/autofill/heuristics/output/11_register_newegg.com.out
+++ b/chrome/test/data/autofill/heuristics/output/11_register_newegg.com.out
@@ -17,8 +17,6 @@ PHONE_HOME_CITY_CODE | BDayPhone_tel1 | Daytime Phone |
 PHONE_HOME_NUMBER | BDayPhone_tel2 | Exchange | 
 PHONE_HOME_NUMBER | BDayPhone_tel3 | Last four digits | 
 UNKNOWN_TYPE | BDayPhone_ext1 | Ext | 
-UNKNOWN_TYPE | same | Is this your shipping address?* | 1
-UNKNOWN_TYPE | same | Yes No | 0
 NAME_FIRST | SFirstName | First Name* | 
 NAME_MIDDLE_INITIAL | SMI | MI | 
 NAME_LAST | SLastName | Last Name* | 
@@ -39,5 +37,3 @@ UNKNOWN_TYPE | education | Education | 0
 UNKNOWN_TYPE | hob | Where did you hear about Newegg.com? | 0
 UNKNOWN_TYPE | FirstPurchase | Is this your first Newegg.com purchase? | 0
 UNKNOWN_TYPE | GameHours | How many hours per week do you play PC games? | 0
-UNKNOWN_TYPE | Spam | Sign me up for exclusive newsletter deals, sweepstakes, and 24-hour sales only available to subscribers | 1
-UNKNOWN_TYPE | SMS | I would like to receive SMS messages via my wireless device. | 1
diff --git a/chrome/test/data/autofill/heuristics/output/12_register_officedepot.com.out b/chrome/test/data/autofill/heuristics/output/12_register_officedepot.com.out
index fea11d1..f5212b9 100644
--- a/chrome/test/data/autofill/heuristics/output/12_register_officedepot.com.out
+++ b/chrome/test/data/autofill/heuristics/output/12_register_officedepot.com.out
@@ -20,7 +20,6 @@ CREDIT_CARD_NUMBER | paymentFormInfo.creditCardNumber | Credit Card Number: |
 CREDIT_CARD_EXP_MONTH | paymentFormInfo.creditCardExpMonth | Expiration Date: |  
 CREDIT_CARD_EXP_4_DIGIT_YEAR | paymentFormInfo.creditCardExpYear | / | -1
 CREDIT_CARD_VERIFICATION_CODE | paymentFormInfo.creditCardCvv | CID | 
-UNKNOWN_TYPE | sameAsBilling | Currently Office Depot is unable to process orders online for delivery to APO/FPO, PO Box, and export addresses. Please click here for additional ordering options * Indicates required field | on
 NAME_FIRST | addrsForm[2].firstName | *First Name: | 
 NAME_MIDDLE_INITIAL | addrsForm[2].middleInitial | Middle Initial: | 
 NAME_LAST | addrsForm[2].lastName | *Last Name: | 
@@ -36,4 +35,3 @@ PHONE_HOME_NUMBER | addrsForm[2].phoneNumber3 | - |
 UNKNOWN_TYPE | addrsForm[2].phoneNumber4 | ext. | 
 EMAIL_ADDRESS | addrsForm[2].email | *Email Address: | 
 UNKNOWN_TYPE | loginForm.loginName | *Login Name: | 
-UNKNOWN_TYPE | loginForm.autoLogin | *Password Confirm: retype your password | on
diff --git a/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out b/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out
index b17bcfb..16e2d49 100644
--- a/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out
+++ b/chrome/test/data/autofill/heuristics/output/12_register_pyramidcollection.com.out
@@ -19,4 +19,3 @@ ADDRESS_HOME_COUNTRY | SC3 | Country * | 0000
 ADDRESS_HOME_ZIP | SZ1 | Zip Code * | 
 PHONE_HOME_WHOLE_NUMBER | SP2 | Day Phone * | 
 PHONE_HOME_WHOLE_NUMBER | SP3 | Evening Phone | 
-UNKNOWN_TYPE | sameAsBilling | Email Address * First Name * Last Name Address Line 1 First Name Last Name | on
diff --git a/chrome/test/data/autofill/heuristics/output/12_register_rediff.com.out b/chrome/test/data/autofill/heuristics/output/12_register_rediff.com.out
index 3d9bed8..628660d 100644
--- a/chrome/test/data/autofill/heuristics/output/12_register_rediff.com.out
+++ b/chrome/test/data/autofill/heuristics/output/12_register_rediff.com.out
@@ -1,14 +1,11 @@
 NAME_FULL | name | : | 
 UNKNOWN_TYPE | login | : | 
 EMAIL_ADDRESS | altemail | : | 
-UNKNOWN_TYPE | chk_altemail |  | on
 UNKNOWN_TYPE | hintq | : | 
 UNKNOWN_TYPE | mothername | : | 
 UNKNOWN_TYPE | DOB_Day | : | 
 UNKNOWN_TYPE | DOB_Month | : | 
 UNKNOWN_TYPE | DOB_Year | : | 
-UNKNOWN_TYPE | gender | : | m
-UNKNOWN_TYPE | gender | Male | f
 ADDRESS_HOME_COUNTRY | country | : | 99
 ADDRESS_HOME_CITY | city | : | 
 UNKNOWN_TYPE | othercity | City : | 
diff --git a/chrome/test/data/autofill/heuristics/output/12_register_rei.com.out b/chrome/test/data/autofill/heuristics/output/12_register_rei.com.out
index c35912ae..f8946ee 100644
--- a/chrome/test/data/autofill/heuristics/output/12_register_rei.com.out
+++ b/chrome/test/data/autofill/heuristics/output/12_register_rei.com.out
@@ -3,4 +3,3 @@ NAME_MIDDLE_INITIAL | middleName | Middle Initial: |
 NAME_LAST | lastName | Last Name:* | 
 ADDRESS_HOME_ZIP | zipCode | ZIP (Postal) Code:* | 
 EMAIL_ADDRESS | email1 | E-mail Address:* | 
-UNKNOWN_TYPE | gearmail |  | y
diff --git a/chrome/test/data/autofill/heuristics/output/13_register_rocketlawyer.com.out b/chrome/test/data/autofill/heuristics/output/13_register_rocketlawyer.com.out
index 5219e25..bdfc780 100644
--- a/chrome/test/data/autofill/heuristics/output/13_register_rocketlawyer.com.out
+++ b/chrome/test/data/autofill/heuristics/output/13_register_rocketlawyer.com.out
@@ -3,4 +3,3 @@ NAME_FIRST | ctl00$ctl00$ctl00$SiteMasterBody$ContentPlaceHolder1$ContentPlaceHo
 NAME_LAST | ctl00$ctl00$ctl00$SiteMasterBody$ContentPlaceHolder1$ContentPlaceHolder1$txtLastName | Last Name * | 
 EMAIL_ADDRESS | ctl00$ctl00$ctl00$SiteMasterBody$ContentPlaceHolder1$ContentPlaceHolder1$txtUserName | Email Address * | 
 EMAIL_ADDRESS | ctl00$ctl00$ctl00$SiteMasterBody$ContentPlaceHolder1$ContentPlaceHolder1$txtConfirmUserName | Confirm Email Address * | 
-UNKNOWN_TYPE | ctl00$ctl00$ctl00$SiteMasterBody$ContentPlaceHolder1$ContentPlaceHolder1$chkNewsletter | Yes, send me Rocket Lawyer partner offers, which are sent no more than twice per month and are from Rocket Lawyer's trusted business partners. | on
diff --git a/chrome/test/data/autofill/heuristics/output/13_register_signup.clicksor.com.out b/chrome/test/data/autofill/heuristics/output/13_register_signup.clicksor.com.out
index cd72aa2..d10e60e 100644
--- a/chrome/test/data/autofill/heuristics/output/13_register_signup.clicksor.com.out
+++ b/chrome/test/data/autofill/heuristics/output/13_register_signup.clicksor.com.out
@@ -10,5 +10,4 @@ ADDRESS_HOME_CITY | city | City: |
 ADDRESS_HOME_STATE | province | State: | 
 ADDRESS_HOME_ZIP | zipCode | Zip                           code: | 
 ADDRESS_HOME_COUNTRY | country | Country: | US
-UNKNOWN_TYPE | termcheck | Country: | ON
 UNKNOWN_TYPE | securityCode | Enter                           the security code shown below: | 
diff --git a/chrome/test/data/autofill/heuristics/output/13_register_signup.live.com.out b/chrome/test/data/autofill/heuristics/output/13_register_signup.live.com.out
index 8e45ebab..0675335 100644
--- a/chrome/test/data/autofill/heuristics/output/13_register_signup.live.com.out
+++ b/chrome/test/data/autofill/heuristics/output/13_register_signup.live.com.out
@@ -9,7 +9,4 @@ UNKNOWN_TYPE | iSQ | Question: | 0
 UNKNOWN_TYPE | iSA | Secret answer: | 
 NAME_FIRST | iFirstName | First name: | 
 NAME_LAST | iLastName | Last name: | 
-UNKNOWN_TYPE | profile_gender |  | m
-UNKNOWN_TYPE | profile_gender |  | f
 UNKNOWN_TYPE | iBirthYear | Birth year: | Example: 1990
-UNKNOWN_TYPE | iOptinEmail | Send me email with promotional offers and survey invitations from Windows Live, Bing, and MSN. (You can unsubscribe at any time.) | on
diff --git a/chrome/test/data/autofill/heuristics/output/13_register_sourceforge.net.out b/chrome/test/data/autofill/heuristics/output/13_register_sourceforge.net.out
index 0f270d8..fae3fb3 100644
--- a/chrome/test/data/autofill/heuristics/output/13_register_sourceforge.net.out
+++ b/chrome/test/data/autofill/heuristics/output/13_register_sourceforge.net.out
@@ -9,8 +9,5 @@ UNKNOWN_TYPE | X3WlBZtvcy22yEf0KrDfhs46rigU | Security Question: |
 UNKNOWN_TYPE | X3XlRdtrBz0a6O_kXqynrr46rigU | Security Answer: | 
 UNKNOWN_TYPE | X0WBbd4KZLSgCIb8WlZZNJ3g3fVk | Job Title: | 
 UNKNOWN_TYPE | X229ZZcPc31emF7VTU0RPmITuTNc | Number of Employees: | 
-UNKNOWN_TYPE | X12VEYcbdixhIflk8_zHDFWB72qk |  | siteupdates
-UNKNOWN_TYPE | X12VEYcbdixhIflk8_zHDFWB72qk |  | research
-UNKNOWN_TYPE | X12VEYcbdixhIflk8_zHDFWB72qk |  | thirdparty
 UNKNOWN_TYPE | X1GJbe8rKlh_p74K4nXnhkGtC-8Q | You seem to have CSS turned off. Please don't fill out this field. | 
 UNKNOWN_TYPE | X1GJbe8rKlx_p74K4nXnhkGtC-8Q | You seem to have CSS turned off. Please don't fill out this field. | 
diff --git a/chrome/test/data/autofill/heuristics/output/13_register_supershuttle.com.out b/chrome/test/data/autofill/heuristics/output/13_register_supershuttle.com.out
index 5f14a5f..879489a 100644
--- a/chrome/test/data/autofill/heuristics/output/13_register_supershuttle.com.out
+++ b/chrome/test/data/autofill/heuristics/output/13_register_supershuttle.com.out
@@ -5,4 +5,3 @@ NAME_LAST | ctl00$cphRight$Registration1$txtLastName | Last Name |
 PHONE_HOME_WHOLE_NUMBER | ctl00$cphRight$Registration1$txtCellPhone | Contact or Cell Phone Number | 
 PHONE_HOME_COUNTRY_CODE | ctl00$cphRight$Registration1$txtCountryCode | If outside the US (Country Code/Phone Number) | 
 PHONE_HOME_CITY_AND_NUMBER | ctl00$cphRight$Registration1$txtIntPhoneNumber | Contact or Cell Phone Number | 
-UNKNOWN_TYPE | ctl00$cphRight$Registration1$chkAcceptSpecialOffers | Email me regarding SuperShuttle special offers and promotions | on
diff --git a/chrome/test/data/autofill/heuristics/output/14_register_target.com.out b/chrome/test/data/autofill/heuristics/output/14_register_target.com.out
index 92dc099..86af5f9 100644
--- a/chrome/test/data/autofill/heuristics/output/14_register_target.com.out
+++ b/chrome/test/data/autofill/heuristics/output/14_register_target.com.out
@@ -1,6 +1,3 @@
 UNKNOWN_TYPE | userName | Your name:* | 
 EMAIL_ADDRESS | email | Your email address:* | 
 EMAIL_ADDRESS | emailCheck | Re-enter email address:* | 
-UNKNOWN_TYPE | subscribeEmail | Yes, please send me e-mails about special offers, exclusives and promotions from Target. | 1
-UNKNOWN_TYPE | ageCheck |  | yes
-UNKNOWN_TYPE | ageCheck | Yes No | no
diff --git a/chrome/test/data/autofill/heuristics/output/14_register_threadless.com.out b/chrome/test/data/autofill/heuristics/output/14_register_threadless.com.out
index 970a420..01983b6 100644
--- a/chrome/test/data/autofill/heuristics/output/14_register_threadless.com.out
+++ b/chrome/test/data/autofill/heuristics/output/14_register_threadless.com.out
@@ -1,4 +1,3 @@
 UNKNOWN_TYPE | create_username | Desired username | 
 EMAIL_ADDRESS | email | Email | 
-UNKNOWN_TYPE | join_newsletter | Join our newsletter and be first to know about new tees and great deals! | on
 UNKNOWN_TYPE | recaptcha_response_field | Type the words above Type the numbers you hear | 
diff --git a/chrome/test/data/autofill/heuristics/output/15_crbug_53075.out b/chrome/test/data/autofill/heuristics/output/15_crbug_53075.out
index fdb5c1fd..a31a732 100644
--- a/chrome/test/data/autofill/heuristics/output/15_crbug_53075.out
+++ b/chrome/test/data/autofill/heuristics/output/15_crbug_53075.out
@@ -11,7 +11,6 @@ ADDRESS_HOME_CITY | ecomms_town | Town / City: |
 ADDRESS_HOME_STATE | ecomms_county | County: | 
 ADDRESS_HOME_ZIP | ecomms_postcode | Postcode: | 
 ADDRESS_HOME_COUNTRY | ecomms_country | Country: | 224
-UNKNOWN_TYPE | delivery_address | Address Details Address1: Address2: Town / City: County: | 1
 UNKNOWN_TYPE | del_title | Title: | 
 NAME_FIRST | del_first_name | First Name: | 
 NAME_LAST | del_last_name | Last Name: | 
diff --git a/chrome/test/data/autofill/heuristics/output/15_crbug_64569.out b/chrome/test/data/autofill/heuristics/output/15_crbug_64569.out
index fc966fb..e828b7a 100644
--- a/chrome/test/data/autofill/heuristics/output/15_crbug_64569.out
+++ b/chrome/test/data/autofill/heuristics/output/15_crbug_64569.out
@@ -1,11 +1,8 @@
-UNKNOWN_TYPE | payment_group | Payment Type We accept Visa, Mastercard, Discover, American Express, and PayPal. | cc
-UNKNOWN_TYPE | payment_group | Payment Type We accept Visa, Mastercard, Discover, American Express, and PayPal. | paypal
 CREDIT_CARD_NAME | ccFullName | (as it appears on the card) | 
 CREDIT_CARD_NUMBER | ccNumber | (no dashes or spaces) | 
 CREDIT_CARD_EXP_MONTH | ccExpMonth | Expiration date | 1
 CREDIT_CARD_EXP_4_DIGIT_YEAR | ccExpYear | Your name (as it appears on the card) Credit card number (no dashes or spaces) Expiration date | 2011
 CREDIT_CARD_VERIFICATION_CODE | ccSecurity | Security code | 
-UNKNOWN_TYPE | sameinfo | First name Last name | on
 NAME_FIRST | addrFirstName | First name | 
 NAME_LAST | addrLastName | Last name | 
 ADDRESS_HOME_LINE1 | addrStreet1 | (street address, PO box, company name) | 
diff --git a/chrome/test/data/autofill/heuristics/output/16_crbug_87517.out b/chrome/test/data/autofill/heuristics/output/16_crbug_87517.out
index f0efa59..329f677 100644
--- a/chrome/test/data/autofill/heuristics/output/16_crbug_87517.out
+++ b/chrome/test/data/autofill/heuristics/output/16_crbug_87517.out
@@ -10,19 +10,10 @@ ADDRESS_HOME_COUNTRY | CC_COUNTRY | Country | United States
 PHONE_HOME_WHOLE_NUMBER | dphone | Telephone | 
 EMAIL_ADDRESS | demail | Email * | 
 UNKNOWN_TYPE | amt | $ | 
-UNKNOWN_TYPE | tributeSelect | Name * | on
-UNKNOWN_TYPE | DonationType | Name * | OneTime
-UNKNOWN_TYPE | DonationType | This is a one time donation | Recurs
 UNKNOWN_TYPE | ccrecurring | I would like to make this a recurring donation deducted | Monthly
 UNKNOWN_TYPE | remLen | ( You may enter up to 500 characters. ) | 500
-UNKNOWN_TYPE | tribute |  | IHO
-UNKNOWN_TYPE | tribute | In Honor Of | IMO
 NAME_FULL | Tribute_Name | Name: | 
 UNKNOWN_TYPE | Tribute_occasion | Occasion: | 
-UNKNOWN_TYPE | Tribute_Disclosure | Occasion: | on
-UNKNOWN_TYPE | Tribute_Notification | I wish to remain anonymous | on
-UNKNOWN_TYPE | Tribute_IncludeAmount |  | 1
-UNKNOWN_TYPE | Tribute_IncludeAmount | Include the amount | 0
 NAME_FULL | Tribute_NotifyName | Name: | 
 EMAIL_ADDRESS | Tribute_Email | Email: | 
 ADDRESS_HOME_LINE1 | Tribute_NotifyAddr | Street: | 
@@ -34,7 +25,6 @@ CREDIT_CARD_NUMBER | ccard | Credit Card Number * |
 CREDIT_CARD_VERIFICATION_CODE | csc | CSC Number * What Is This? | 
 CREDIT_CARD_EXP_MONTH | ExpMon | Month | 1
 CREDIT_CARD_EXP_4_DIGIT_YEAR | ExpYear | Year | 11
-UNKNOWN_TYPE | SameAddress | Billing Address - | checkbox
 ADDRESS_HOME_LINE1 | CC_Addr | Address 1 * | 
 ADDRESS_HOME_LINE2 | CC_Addr2 | Address 2 | 
 ADDRESS_HOME_CITY | CC_City | City / State / Zip * | 
diff --git a/chrome/test/data/autofill/heuristics/output/16_crbug_98152.out b/chrome/test/data/autofill/heuristics/output/16_crbug_98152.out
index 96a0bd8..f30ea74 100644
--- a/chrome/test/data/autofill/heuristics/output/16_crbug_98152.out
+++ b/chrome/test/data/autofill/heuristics/output/16_crbug_98152.out
@@ -4,7 +4,6 @@ CREDIT_CARD_EXP_MONTH | CCForm.expirationMonth | Expiration date | 9
 CREDIT_CARD_EXP_4_DIGIT_YEAR | CCForm.expirationYear | Expiration date | 2011
 CREDIT_CARD_NAME | CCForm.name | Name as it appears on card | 
 CREDIT_CARD_VERIFICATION_CODE | CCForm.cid |  | 
-UNKNOWN_TYPE | isBillingAddress | Make the most of your shopping experience with the Walmart Discover® or Walmart Credit Card®. Learn More or Apply Now. Debit cards (also called check cards, ATM cards or bank cards) are accepted if they have a Visa or MasterCard logo. | on
 COMPANY_NAME | CCForm.companyName | Company Name | 
 ADDRESS_HOME_LINE1 | addressForm.street1 | Address Line 1 | 
 ADDRESS_HOME_LINE2 | addressForm.street2 | Address Line 2 | 
diff --git a/chrome/test/data/autofill/heuristics/output/16_crbug_98269.out b/chrome/test/data/autofill/heuristics/output/16_crbug_98269.out
index 7627710..1a62e8e 100644
--- a/chrome/test/data/autofill/heuristics/output/16_crbug_98269.out
+++ b/chrome/test/data/autofill/heuristics/output/16_crbug_98269.out
@@ -1,4 +1,3 @@
-UNKNOWN_TYPE | PaymentMethod |  | BL
 PHONE_HOME_CITY_CODE | txtHomePhone1 | * Home Phone: | 
 PHONE_HOME_NUMBER | txtHomePhone2 | * Home Phone: | 
 PHONE_HOME_NUMBER | txtHomePhone3 | * Home Phone: | 
@@ -7,13 +6,9 @@ UNKNOWN_TYPE | txtSSN | XXX-XX- |
 UNKNOWN_TYPE | selBirthMonth | * Date of Birth: | Month
 UNKNOWN_TYPE | selBirthDate | * Date of Birth: | Date
 UNKNOWN_TYPE | selBirthYear | * Date of Birth: | Year
-UNKNOWN_TYPE | chkTAC | * | on
-UNKNOWN_TYPE | PaymentMethod |  | CK
-UNKNOWN_TYPE | PaymentMethod |  | AddNew
 CREDIT_CARD_TYPE | cardType | Type: | VI
 CREDIT_CARD_NUMBER | CreditCardNumber | Number: | 
 CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR | CreditCardExpYYMM | Expiration: | 092011
 CREDIT_CARD_VERIFICATION_CODE | CVV | Security Code: | 
-UNKNOWN_TYPE | useGiftCard | QVC Gift Cards | on
 UNKNOWN_TYPE | GiftCardNum | Card Number: | 
 UNKNOWN_TYPE | GiftCardPIN | Security ID Number: | 
diff --git a/chrome/test/data/autofill/heuristics/output/16_crbug_98286.out b/chrome/test/data/autofill/heuristics/output/16_crbug_98286.out
index 65ec560..84dbe6e 100644
--- a/chrome/test/data/autofill/heuristics/output/16_crbug_98286.out
+++ b/chrome/test/data/autofill/heuristics/output/16_crbug_98286.out
@@ -4,4 +4,3 @@ CREDIT_CARD_NUMBER | txtCreditCardNumber | *Card number: |
 CREDIT_CARD_EXP_MONTH | drpdwnExpirationMonth | *Expiration date: | 00
 CREDIT_CARD_EXP_4_DIGIT_YEAR | drpdwnExpirationYear | *Expiration date: | 2011
 CREDIT_CARD_VERIFICATION_CODE | txtVisaVerificationNumber | VISA Card Verification # | 
-UNKNOWN_TYPE | chkUnreadable | I can't read the numbers | on
diff --git a/chrome/test/data/autofill/heuristics/output/20_register_alaskaair.com.out b/chrome/test/data/autofill/heuristics/output/20_register_alaskaair.com.out
index e2af6c2..354c8a1 100644
--- a/chrome/test/data/autofill/heuristics/output/20_register_alaskaair.com.out
+++ b/chrome/test/data/autofill/heuristics/output/20_register_alaskaair.com.out
@@ -1,5 +1,3 @@
-UNKNOWN_TYPE | FormUserControl$_mileagePlanNumber$_mileagePlanChoice | Mileage Plan™ Number * | _needMileagePlanNbr
-UNKNOWN_TYPE | FormUserControl$_mileagePlanNumber$_mileagePlanChoice | I have an Alaska Airlines Mileage Plan Number | _haveMileagePlanNbr
 UNKNOWN_TYPE | FormUserControl$_mileagePlanNumber$_loyaltyNumber$_loyaltyNumber | Mileage Plan Number | 
 NAME_FIRST | FormUserControl$_personalIdentification$_firstName$_name | Legal First Name* | 
 UNKNOWN_TYPE | FormUserControl$_personalIdentification$_title$_title | Title | 
@@ -30,8 +28,4 @@ EMAIL_ADDRESS | FormUserControl$_contactInformation$_emailAddress$_emailAddressT
 UNKNOWN_TYPE | FormUserControl$_userIdPassword$_userId$_userId | Create a User ID* | 
 UNKNOWN_TYPE | FormUserControl$_secretQuestion$_question | Secret Question* | 
 UNKNOWN_TYPE | FormUserControl$_secretQuestion$_answer | Please choose a secret question and provide the answer. You will need to answer the question again in case you forget your password. Make sure you choose a question and answer that are easy for you to remember, but difficult for other people to know.Secret Question* Answer* | 
-UNKNOWN_TYPE | FormUserControl$_subscriptionsOffers$_insiderNewsletter$_subscriptionCheckBox | Insider NewsletterA weekly email personalized to provide you with an insider glimpse of the best deals we have to offer - across the board. | on
 ADDRESS_HOME_CITY | FormUserControl$_subscriptionsOffers$_primaryDepartureCity$_primaryDepartureCity$_city | Primary Departure City | 
-UNKNOWN_TYPE | FormUserControl$_subscriptionsOffers$_eStatements$_subscriptionCheckBox | Mileage Plan E-Statements and Partner OffersA monthly recap of your Mileage Plan activity along with program news, exclusive partner offers, and countless ways to earn free travel faster. | on
-UNKNOWN_TYPE | FormUserControl$_subscriptionsOffers$_asQXAnnouncements$_subscriptionCheckBox | Alaska AnnouncementsOccasional email that puts you "in the know" about sales, promotions, and other important travel information. | on
-UNKNOWN_TYPE | FormUserControl$_mpTermsAndConditions$_iAgree | Mileage Plan™ Terms & Conditions* I acknowledge that I have reviewed these Mileage Plan Terms and Conditions | on