commented out both billing address fields