diff --git a/payment/uc_2checkout/uc_2checkout.install b/payment/uc_2checkout/uc_2checkout.install
index 42a7df6..ab5dd2b 100644
--- a/payment/uc_2checkout/uc_2checkout.install
+++ b/payment/uc_2checkout/uc_2checkout.install
@@ -13,3 +13,10 @@ function uc_2checkout_uninstall() {
     ->condition('name', 'uc_2checkout_%', 'LIKE')
     ->execute();
 }
+
+/**
+ * Remove unused variable.
+ */
+function uc_2checkout_update_7300() {
+  variable_del('uc_2checkout_checkout_button');
+}
diff --git a/payment/uc_2checkout/uc_2checkout.module b/payment/uc_2checkout/uc_2checkout.module
index b0c2939..694a964 100644
--- a/payment/uc_2checkout/uc_2checkout.module
+++ b/payment/uc_2checkout/uc_2checkout.module
@@ -41,7 +41,6 @@ function uc_2checkout_menu() {
 function uc_2checkout_init() {
   global $conf;
   $conf['i18n_variables'][] = 'uc_2checkout_method_title';
-  $conf['i18n_variables'][] = 'uc_2checkout_checkout_button';
 }
 
 /**
@@ -154,12 +153,6 @@ function uc_payment_method_2checkout($op, &$order, $form = NULL, &$form_state =
         '#title' => t('Payment method title'),
         '#default_value' => variable_get('uc_2checkout_method_title', t('Credit card on a secure server:')),
       );
-      $form['uc_2checkout_checkout_button'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Order review submit button text'),
-        '#description' => t('Provide 2Checkout specific text for the submit button on the order review page.'),
-        '#default_value' => variable_get('uc_2checkout_checkout_button', t('Submit Order')),
-      );
       $form['uc_2checkout_checkout_type'] = array(
         '#type' => 'select',
         '#title' => t('2Checkout.com checkout type'),
@@ -223,7 +216,7 @@ function uc_2checkout_form($form, &$form_state, $order) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
-    '#value' => variable_get('uc_2checkout_checkout_button', t('Submit Order')),
+    '#value' => t('Submit order'),
   );
 
   return $form;
diff --git a/payment/uc_paypal/uc_paypal.install b/payment/uc_paypal/uc_paypal.install
index 6e6fd0c..e8f5e88 100644
--- a/payment/uc_paypal/uc_paypal.install
+++ b/payment/uc_paypal/uc_paypal.install
@@ -195,3 +195,10 @@ function uc_paypal_update_7300() {
     ->condition('order_status_id', 'paypal_pending')
     ->execute();
 }
+
+/**
+ * Remove unused variable.
+ */
+function uc_paypal_update_7301() {
+  variable_del('uc_paypal_wps_checkout_button');
+}
diff --git a/payment/uc_paypal/uc_paypal.module b/payment/uc_paypal/uc_paypal.module
index d439ecb..d8f9c54 100644
--- a/payment/uc_paypal/uc_paypal.module
+++ b/payment/uc_paypal/uc_paypal.module
@@ -73,14 +73,6 @@ function uc_paypal_menu() {
 }
 
 /**
- * Implements hook_init().
- */
-function uc_paypal_init() {
-  global $conf;
-  $conf['i18n_variables'][] = 'uc_paypal_wps_checkout_button';
-}
-
-/**
  * Implements hook_form_FORM_ID_alter() for uc_cart_checkout_form().
  */
 function uc_paypal_form_uc_cart_checkout_form_alter(&$form, &$form_state, $form_id) {
@@ -440,12 +432,6 @@ function uc_payment_method_paypal_wps($op, &$order) {
         ),
         '#default_value' => variable_get('uc_paypal_wps_payment_action', 'Sale'),
       );
-      $form['uc_paypal_wps_checkout_button'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Order review submit button text'),
-        '#description' => t('Provide PayPal WPS specific text for the submit button on the order review page.'),
-        '#default_value' => variable_get('uc_paypal_wps_checkout_button', t('Submit Order')),
-      );
       $form['uc_paypal_wps_cancel_return_url'] = array(
         '#type' => 'textfield',
         '#title' => t('Cancel return URL'),
@@ -960,7 +946,7 @@ function uc_paypal_wps_form($form, &$form_state, $order) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
-    '#value' => variable_get('uc_paypal_wps_checkout_button', t('Submit Order')),
+    '#value' => t('Submit order'),
   );
 
   return $form;
diff --git a/uc_cart/tests/uc_cart.test b/uc_cart/tests/uc_cart.test
index 9cea87f..314657e 100644
--- a/uc_cart/tests/uc_cart.test
+++ b/uc_cart/tests/uc_cart.test
@@ -667,17 +667,12 @@ class UbercartCartSettingsTestCase extends UbercartTestHelper {
       'uc_continue_shopping_url',
       t('Default continue shopping link URL field exists')
     );
-    $this->assertField(
-      'uc_continue_shopping_text',
-      t('Custom continue shopping link text field exists')
-    );
 
     // Test continue shopping button that sends users to a fixed URL.
     $settings = array(
       'uc_continue_shopping_type' => 'button',
       'uc_continue_shopping_use_last_url' => FALSE,
       'uc_continue_shopping_url' => $this->randomName(8),
-      'uc_continue_shopping_text' => $this->randomName(16),
     );
     $this->drupalPost(
       NULL,
@@ -688,13 +683,13 @@ class UbercartCartSettingsTestCase extends UbercartTestHelper {
     $this->drupalPost(
       'cart',
       array(),
-      $settings['uc_continue_shopping_text']
+      t('Continue shopping')
     );
     $url_pass = ($this->getUrl() == url($settings['uc_continue_shopping_url'],
       array('absolute' => TRUE)));
     $this->assertTrue(
       $url_pass,
-      t('Continue shopping button is properly labelled, and takes the user to the correct URL.')
+      t('Continue shopping button takes the user to the correct URL.')
     );
   }
 
diff --git a/uc_cart/uc_cart.admin.inc b/uc_cart/uc_cart.admin.inc
index 69d31d6..61043e7 100644
--- a/uc_cart/uc_cart.admin.inc
+++ b/uc_cart/uc_cart.admin.inc
@@ -176,12 +176,6 @@ function uc_cart_cart_settings_form($form, &$form_state) {
     '#size' => 32,
     '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
   );
-  $form['continue_shopping']['uc_continue_shopping_text'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Custom <em>continue shopping</em> text'),
-    '#description' => t('Enter replacement text for the <em>continue shopping</em> element.'),
-    '#default_value' => variable_get('uc_continue_shopping_text', ''),
-  );
 
   $form['breadcrumb'] = array(
     '#type' => 'fieldset',
diff --git a/uc_cart/uc_cart.install b/uc_cart/uc_cart.install
index 55f89a5..b750bb6 100644
--- a/uc_cart/uc_cart.install
+++ b/uc_cart/uc_cart.install
@@ -84,7 +84,6 @@ function uc_cart_uninstall() {
   variable_del('uc_minimum_subtotal');
   variable_del('uc_add_item_redirect');
   variable_del('uc_continue_shopping_url');
-  variable_del('uc_continue_shopping_text');
   variable_del('uc_continue_shopping_type');
   variable_del('uc_use_next_buttons');
   variable_del('uc_collapse_current_pane');
@@ -133,3 +132,10 @@ function uc_cart_update_7001() {
     'default' => 0,
   ));
 }
+
+/**
+ * Remove unused variable.
+ */
+function uc_cart_update_7300() {
+  variable_del('uc_continue_shopping_text');
+}
diff --git a/uc_cart/uc_cart.module b/uc_cart/uc_cart.module
index 8badb41..8fa9529 100644
--- a/uc_cart/uc_cart.module
+++ b/uc_cart/uc_cart.module
@@ -209,7 +209,6 @@ function uc_cart_init() {
   global $conf;
   $conf['i18n_variables'][] = 'uc_cart_breadcrumb_text';
   $conf['i18n_variables'][] = 'uc_cart_help_text';
-  $conf['i18n_variables'][] = 'uc_continue_shopping_text';
 }
 
 /**
@@ -658,19 +657,16 @@ function uc_cart_view_form($form, &$form_state, $items = NULL) {
 
   // If the continue shopping element is enabled...
   if (($cs_type = variable_get('uc_continue_shopping_type', 'link')) !== 'none') {
-    // Setup the text used for the element.
-    $cs_text = variable_get('uc_continue_shopping_text', '') ? variable_get('uc_continue_shopping_text', '') : t('Continue shopping');
-
     // Add the element to the form based on the element type.
     if (variable_get('uc_continue_shopping_type', 'link') == 'link') {
       $form['actions']['continue_shopping'] = array(
-        '#markup' => l($cs_text, uc_cart_continue_shopping_url()),
+        '#markup' => l(t('Continue shopping'), uc_cart_continue_shopping_url()),
       );
     }
     elseif (variable_get('uc_continue_shopping_type', 'link') == 'button') {
       $form['actions']['continue_shopping'] = array(
         '#type' => 'submit',
-        '#value' => $cs_text,
+        '#value' => t('Continue shopping'),
         '#submit' => array('uc_cart_view_form_submit', 'uc_cart_view_form_continue_shopping'),
       );
     }
diff --git a/uc_roles/uc_roles.install b/uc_roles/uc_roles.install
index 3d213b6..1a73612 100644
--- a/uc_roles/uc_roles.install
+++ b/uc_roles/uc_roles.install
@@ -183,7 +183,9 @@ function uc_roles_schema() {
  * Implements hook_update_last_removed().
  */
 function uc_roles_update_last_removed() {
-  return 6004;
+  // 7.x-3.0-beta2 and earlier were installed with schema version 0,
+  // which causes update.php to fail.
+  return drupal_get_installed_schema_version('uc_roles') == 0 ? 0 : 6004;
 }
 
 /**
@@ -197,3 +199,12 @@ function uc_roles_uninstall() {
     ->condition('name', 'uc_roles_%', 'LIKE')
     ->execute();
 }
+
+/**
+ * Remove unused variables.
+ */
+function uc_roles_update_7300() {
+  variable_del('uc_roles_default_expiration_header');
+  variable_del('uc_roles_default_expiration_message');
+  variable_del('uc_roles_default_expiration_title');
+}
diff --git a/uc_roles/uc_roles.module b/uc_roles/uc_roles.module
index 7126d85..d7ee52c 100644
--- a/uc_roles/uc_roles.module
+++ b/uc_roles/uc_roles.module
@@ -99,16 +99,6 @@ function uc_roles_menu() {
 }
 
 /**
- * Implements hook_init().
- */
-function uc_roles_init() {
-  global $conf;
-  $conf['i18n_variables'][] = 'uc_roles_default_expiration_header';
-  $conf['i18n_variables'][] = 'uc_roles_default_expiration_message';
-  $conf['i18n_variables'][] = 'uc_roles_default_expiration_title';
-}
-
-/**
  * Implements hook_permission().
  */
 function uc_roles_permission() {
@@ -378,11 +368,10 @@ function uc_roles_user_view($account, $view_mode) {
 
   $expirations = db_query("SELECT * FROM {uc_roles_expirations} WHERE uid = :uid", array(':uid' => $account->uid));
   foreach ($expirations as $expiration) {
-    $substitution = array('!role_name' => check_plain(_uc_roles_get_name($expiration->rid)), '!date' => format_date($expiration->expiration, 'short'));
     $form[$expiration->rid] = array(
       '#type' => 'user_profile_item',
-      '#title' => strtr(variable_get('uc_roles_default_expiration_title', uc_get_message('uc_roles_user_expiration_title')), $substitution),
-      '#markup' => strtr(variable_get('uc_roles_default_expiration_message', uc_get_message('uc_roles_user_expiration_message')), $substitution),
+      '#title' => check_plain(_uc_roles_get_name($expiration->rid)),
+      '#markup' => t('This role will expire on !date', array('!date' => format_date($expiration->expiration, 'short'))),
     );
   }
 
@@ -394,7 +383,7 @@ function uc_roles_user_view($account, $view_mode) {
   $item = array(
     '#type' => 'user_profile_category',
     '#weight' => '-1',
-    '#title' => variable_get('uc_roles_default_expiration_header', uc_get_message('uc_roles_user_expiration_header')),
+    '#title' => t('Expiring roles'),
   );
 
   $account->content['uc_roles'] = $item + $form;
@@ -473,9 +462,6 @@ function uc_roles_uc_message() {
   $messages['uc_roles_renew_message'] = t("[order:first-name] [order:last-name], \n\nThanks to your order, [order:link], at [store:name] you have renewed the role, [expiration:name]. It is now set to expire on [expiration:expiration:short].\n\nThanks again, \n\n[store:name]\n[site:slogan]");
   $messages['uc_roles_reminder_subject'] = t('[store:name]: [expiration:name] role expiration notice');
   $messages['uc_roles_reminder_message'] = t("This message is to remind you that the role, [expiration:name], you acquired by making a purchase at our store will expire at [expiration:expiration:short]. You may visit [store:link] to renew this role before it expires.\n\nThanks again, \n\n[store:name]\n[site:slogan]");
-  $messages['uc_roles_user_expiration_header'] = t("Expiring roles");
-  $messages['uc_roles_user_expiration_title'] = t("!role_name");
-  $messages['uc_roles_user_expiration_message'] = t("This role will expire on !date");
 
   return $messages;
 }
@@ -913,34 +899,12 @@ function uc_roles_feature_settings($form, &$form_state) {
     '#prefix' => '<div class="expiration">',
     '#suffix' => '</div>',
   );
-  $form['uc_roles_expiration_display'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Expiration display'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-  );
-  $form['uc_roles_expiration_display']['uc_roles_default_show_expiration'] = array(
+  $form['uc_roles_default_show_expiration'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show expirations on user page'),
     '#default_value' => variable_get('uc_roles_default_show_expiration', TRUE),
     '#description' => t('If users have any role expirations they will be displayed on their account page.'),
   );
-  $form['uc_roles_expiration_display']['uc_roles_default_expiration_header'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Header'),
-    '#default_value' => variable_get('uc_roles_default_expiration_header', uc_get_message('uc_roles_user_expiration_header')),
-  );
-  $form['uc_roles_expiration_display']['uc_roles_default_expiration_title'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Title'),
-    '#default_value' => variable_get('uc_roles_default_expiration_title', uc_get_message('uc_roles_user_expiration_title')),
-  );
-  $form['uc_roles_expiration_display']['uc_roles_default_expiration_message'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Message'),
-    '#default_value' => variable_get('uc_roles_default_expiration_message', uc_get_message('uc_roles_user_expiration_message')),
-    '#description' => t('The message, with its accompanying title, and the header displayed above all role expirations. In the <strong>Title</strong> & <strong>Message</strong> fields "!role_name" and "!date" will translate to the corresponding Drupal role name and role expiration date.'),
-  );
   return $form;
 }