diff --git a/quickbar.admin.inc b/quickbar.admin.inc
index c05c7f6..33f1603 100644
--- a/quickbar.admin.inc
+++ b/quickbar.admin.inc
@@ -16,21 +16,6 @@
  *  A form setting quicbar menus per role.
  */
 function quickbar_form(&$form_state) {
-
-  $form['settings_header'] = array(
-    '#value' => '<h2>' . t('Settings') . '</h2>',
-  );
-
-  $form['settings_icon_bypass'] = array(
-    '#type' => 'checkbox',
-    '#title' => 'Do not load the icons css.  This will make it easier for other themes to provide different icons like Rubik.',
-    '#default_value' => variable_get('quickbar_icon_bypass', 0),
-  );
-
-  $form['menus_header'] = array(
-    '#value' => '<h2>' . t('Assign Menus To Roles') . '</h2>',
-  );
-
   $form['intro'] = array(
     '#value' => '<p>' . t('Choose which menu and icon set should be used for each role. If a user has multiple roles they will get the menu of the higher role which has an assigned menu.') . '</p>',
   );
@@ -94,8 +79,6 @@ function quickbar_form(&$form_state) {
  * @ingroup forms
  */
 function quickbar_form_submit(&$form, &$form_state) {
-  variable_set('quickbar_icon_bypass', $form_state['values']['settings_icon_bypass']);
-
   $iconset_info = module_invoke_all('quickbar_iconset_info');
   $roles = user_roles();
   $weights = array();
@@ -119,10 +102,7 @@ function quickbar_form_submit(&$form, &$form_state) {
  */
 function theme_quickbar_form($form) {
 
-  $output = drupal_render($form['settings_header']);
-  $output .= drupal_render($form['settings_icon_bypass']);
-  $output .= drupal_render($form['menus_header']);
-  $output .= drupal_render($form['intro']);
+  $output = drupal_render($form['intro']);
 
   // Get the weighted list of roles and add roles that haven't been weighted yet
   $roles = unserialize(variable_get('quickbar_role_weights', ''));
diff --git a/quickbar.install b/quickbar.install
index 2e33f92..7d4ce19 100644
--- a/quickbar.install
+++ b/quickbar.install
@@ -9,3 +9,10 @@ function quickbar_enable() {
 
   drupal_set_message(t('Please go to the !quick_config screen to configure Quickbar.', array('!quick_config' => l('Quickbar configuration', 'admin/settings/quickbar'))));
 }
+
+function quickbar_update_6101() {
+  $ret = array();
+  // Icon bypass doesn't exist anymore.
+  variable_del('quickbar_icon_bypass');
+  return $ret;
+}