=== modified file 'uc_cart/uc_cart.admin.inc'
--- uc_cart/uc_cart.admin.inc	2009-01-30 21:55:39 +0000
+++ uc_cart/uc_cart.admin.inc	2009-02-18 15:22:56 +0000
@@ -252,20 +252,6 @@
     ),
     '#default_value' => variable_get('uc_checkout_anonymous', TRUE),
   );
-  $form['general']['uc_checkout_review_button'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Review order button text'),
-    '#description' => t('Change the text on the review order button at the bottom of the checkout screen.'),
-    '#summary' => t('Review order button says @button_text', array('@button_text' => variable_get('uc_checkout_review_button', t('Review order')))),
-    '#default_value' => variable_get('uc_checkout_review_button', t('Review order')),
-  );
-  $form['general']['uc_checkout_submit_button'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Submit order button text'),
-    '#description' => t('Change the text on the submit order button at the bottom of the review screen.'),
-    '#summary' => t('Submit order button says @button_text', array('@button_text' => variable_get('uc_checkout_submit_button', t('Submit order')))),
-    '#default_value' => variable_get('uc_checkout_submit_button', t('Submit order')),
-  );
   $form['general']['uc_cart_delivery_not_shippable'] = array(
     '#type' => 'checkbox',
     '#title' => t('Hide shipping information when possible for carts with no shippable items.'),
@@ -302,13 +288,6 @@
     ),
     '#default_value' => variable_get('uc_collapse_current_pane', TRUE),
   );
-  $form['pane_settings']['uc_checkout_next_button'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Next pane button text'),
-    '#description' => t('Change the text on the checkout pane buttons to expand the next pane.'),
-    '#default_value' => variable_get('uc_checkout_next_button', t('Next')),
-    '#summary' => t('Next buttons on checkout panes say %text', array('%text' => variable_get('uc_checkout_next_button', t('Next')))),
-  );
 
   $form['completion'] = array(
     '#type' => 'fieldset',

=== modified file 'uc_cart/uc_cart.install'
--- uc_cart/uc_cart.install	2008-10-13 18:26:36 +0000
+++ uc_cart/uc_cart.install	2009-02-18 15:22:38 +0000
@@ -89,3 +89,12 @@
 
   return $ret;
 }
+
+function uc_cart_update_6001() {
+  // Remove unused variables.
+  variable_del('uc_checkout_review_button');
+  variable_del('uc_checkout_submit_button');
+  variable_del('uc_checkout_next_button');
+
+  return array();
+}

=== modified file 'uc_cart/uc_cart.module'
--- uc_cart/uc_cart.module	2009-02-18 13:39:30 +0000
+++ uc_cart/uc_cart.module	2009-02-18 15:16:41 +0000
@@ -730,7 +730,7 @@
   global $user;
 
   $messages['checkout_instructions'] = '';
-  $messages['review_instructions'] = t("Your order is almost complete. Please review the details below and click '!submit' if all the information is correct.  You may use the 'Back' button to make changes to your order if necessary.", array('!submit' => variable_get('uc_checkout_submit_button', t('Submit order'))));
+  $messages['review_instructions'] = t("Your order is almost complete. Please review the details below and click 'Submit order' if all the information is correct.  You may use the 'Back' button to make changes to your order if necessary.");
   $messages['completion_message'] = t('Your order is complete! Your order number is [order-id].');
   $messages['completion_logged_in'] = t('Thank you for shopping at [store-name]. While logged in, you may continue shopping or <a href="[order-url]">view your current order status</a> and order history.');
   $messages['completion_existing_user'] = t("Thank you for shopping at [store-name]. Your current order has been attached to the account we found matching your e-mail address\n\n<a href=\"[site-url]/user\">Login</a> and view your current order status and order history. Remember to login when you make your next purchase for a faster checkout experience!");

=== modified file 'uc_cart/uc_cart.pages.inc'
--- uc_cart/uc_cart.pages.inc	2009-02-13 15:43:12 +0000
+++ uc_cart/uc_cart.pages.inc	2009-02-18 15:23:18 +0000
@@ -176,7 +176,7 @@
           $opt = variable_get('uc_collapse_current_pane', FALSE) ? $pane['id'] : 'false';
           $form['panes'][$pane['id']]['next'] = array(
             '#type' => 'button',
-            '#value' => variable_get('uc_checkout_next_button', t('Next')),
+            '#value' => t('Next'),
             '#weight' => variable_get("uc_pane_{$pane_id}_field_button_weight", 20),
             '#attributes' => array('onclick' => "return uc_cart_next_button_click(this, '". $pane['next'] ."', '". $opt ."');"),
             '#prefix' => '<div class="next-button show-onload">',
@@ -191,9 +191,20 @@
   }
   unset($_SESSION['expanded_panes']);
 
-  $form['cart_contents'] = array('#type' => 'hidden', '#value' => serialize(uc_cart_get_contents()));
-  $form['cancel'] = array('#type' => 'submit', '#submit' => FALSE, '#value' => t('Cancel'));
-  $form['continue'] = array('#type' => 'submit', '#value' => variable_get('uc_checkout_review_button', t('Review order')));
+  $form['cart_contents'] = array(
+    '#type' => 'hidden',
+    '#value' => serialize(uc_cart_get_contents()),
+  );
+
+  $form['cancel'] = array(
+    '#type' => 'submit',
+    '#value' => t('Cancel'),
+    '#submit' => FALSE,
+  );
+  $form['continue'] = array(
+    '#type' => 'submit',
+    '#value' => t('Review order'),
+  );
 
   return $form;
 }
@@ -382,12 +393,12 @@
 
   $form['back'] = array(
     '#type' => 'submit',
+    '#value' => t('Back'),
     '#submit' => array('uc_cart_checkout_review_form_back'),
-    '#value' => t('Back'),
   );
   $form['submit'] = array(
     '#type' => 'submit',
-    '#value' => variable_get('uc_checkout_submit_button', t('Submit order')),
+    '#value' => t('Submit order'),
   );
 
   return $form;