Index: ckeditor/includes/ckeditor.user.inc
===================================================================
--- ckeditor/includes/ckeditor.user.inc	(revision 6954)
+++ ckeditor/includes/ckeditor.user.inc	(working copy)
@@ -34,7 +34,7 @@
     module_load_include('inc', 'ckeditor', 'includes/ckeditor.lib');
 
     $profile = ckeditor_user_get_profile($user);
-    $toolbar_options = ckeditor_load_toolbar_options();
+    //$toolbar_options = ckeditor_load_toolbar_options();
     $skin_options = ckeditor_load_skin_options();
     $lang_options = ckeditor_load_lang_options();
 
@@ -101,13 +101,13 @@
         '#description' => t('Choose a CKEditor skin.'),
       );
 
-      $form['ckeditor']['ckeditor_toolbar'] = array(
-        '#type' => 'select',
-        '#title' => t('Toolbar'),
-        '#default_value' => isset($user->ckeditor_toolbar) ? $user->ckeditor_toolbar : (isset($profile->settings['toolbar']) ? $profile->settings['toolbar'] : 'default'),
-        '#options' => $toolbar_options,
-        '#description' => t('Choose a CKEditor toolbar set.'),
-      );
+      //$form['ckeditor']['ckeditor_toolbar'] = array(
+      //  '#type' => 'select',
+      //  '#title' => t('Toolbar'),
+      //  '#default_value' => isset($user->ckeditor_toolbar) ? $user->ckeditor_toolbar : (isset($profile->settings['toolbar']) ? $profile->settings['toolbar'] : 'default'),
+      //  '#options' => $toolbar_options,
+      //  '#description' => t('Choose a CKEditor toolbar set.'),
+      //);
 
       $form['ckeditor']['ckeditor_expand'] = array(
         '#type' => 'select',