Index: uc_fedex.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_fedex/uc_fedex.admin.inc,v
retrieving revision 1.1
diff -u -r1.1 uc_fedex.admin.inc
--- uc_fedex.admin.inc	13 Apr 2009 00:45:05 -0000	1.1
+++ uc_fedex.admin.inc	24 Apr 2009 18:29:35 -0000
@@ -118,17 +118,6 @@
     '#description'   => t('Package Type.  It is assumed that all your packages are using the same packaging.'),
   );
 
-  /* Form to select Residential/Commercial destination address */
-  $form['uc_fedex_residential_quotes'] = array(
-    '#type'          => 'radios',
-    '#title'         => t('Quote rates assuming destination is a'),
-    '#default_value' => variable_get('uc_fedex_residential_quotes', 1),
-    '#options'       => array(
-      0 => t('Commercial address'),
-      1 => t('Residential address (extra fees)'),
-    ),
-  );
-
   /* Form to add optional Insurance coverage in the amount of the order */
   $form['uc_fedex_insurance'] = array(
     '#type'          => 'checkbox',
Index: uc_fedex.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_fedex/uc_fedex.module,v
retrieving revision 1.19
diff -u -r1.19 uc_fedex.module
--- uc_fedex.module	13 Apr 2009 14:21:29 -0000	1.19
+++ uc_fedex.module	24 Apr 2009 18:29:35 -0000
@@ -64,6 +64,14 @@
     drupal_add_css(drupal_get_path('module', 'uc_fedex') .'/uc_fedex.css');
 }
 
+/**
+ * Implementation of hook_form_alter().
+ */
+function uc_fedex_form_uc_cart_checkout_form_alter(&$form, &$form_state) {
+  //drupal_set_message('<pre>'. check_plain(print_r($form, 1)) .'</pre>');
+  // Add description to the company field explaning that entering a company enables commercial rates 
+  $form['panes']['delivery']['delivery_company']['#description'] = t('Leave company blank for residential deliveries.');
+}
 
 /**
  * Implementation of hook_theme() used to declare module theme functions.
@@ -257,8 +265,8 @@
     $destination->country_iso_code_2 = $country_data->country_iso_code_2;
   }
 
-  /* Load preference for Residence/Commercial destination address */
-  if (variable_get('uc_fedex_residential_quotes', 1)) {
+  /* Determine if shipping to a residential or commercial address */
+  if (empty($destination->company)) {
     $destination->residence = TRUE;
   }
   else {
Index: uc_fedex.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/uc_fedex/uc_fedex.install,v
retrieving revision 1.3
diff -u -r1.3 uc_fedex.install
--- uc_fedex.install	12 Apr 2009 05:58:57 -0000	1.3
+++ uc_fedex.install	24 Apr 2009 18:29:35 -0000
@@ -21,7 +21,6 @@
   variable_del('uc_fedex_quote_type');
   variable_del('uc_fedex_dropoff_type');
   variable_del('uc_fedex_package_type');
-  variable_del('uc_fedex_residential_quotes');
   variable_del('uc_fedex_insurance');
 
   variable_del('uc_fedex_rate_markup');
@@ -29,3 +28,13 @@
   variable_del('uc_fedex_weight_markup');
   variable_del('uc_fedex_weight_markup_type');
 }
+
+/**
+ * Implementation of hook_update_index
+ * 
+ * Delete unused variables
+ */
+function uc_fedex_update_6200() {
+  variable_del('uc_fedex_residential_quotes');
+  return array();
+}