Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.328
diff -u -p -r1.328 menu.inc
--- includes/menu.inc	10 Jun 2009 21:52:36 -0000	1.328
+++ includes/menu.inc	27 Jun 2009 15:07:15 -0000
@@ -1368,28 +1368,6 @@ function menu_list_system_menus() {
 }
 
 /**
- * Return an array of links to be rendered as the Main menu.
- */
-function menu_main_menu() {
-  return menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'));
-}
-
-/**
- * Return an array of links to be rendered as the Secondary links.
- */
-function menu_secondary_menu() {
-
-  // If the secondary menu source is set as the primary menu, we display the
-  // second level of the primary menu.
-  if (variable_get('menu_secondary_links_source', 'user-menu') == variable_get('menu_main_links_source', 'main-menu')) {
-    return menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'), 1);
-  }
-  else {
-    return menu_navigation_links(variable_get('menu_secondary_links_source', 'user-menu'), 0);
-  }
-}
-
-/**
  * Return an array of links for a navigation menu.
  *
  * @param $menu_name
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.49
diff -u -p -r1.49 menu.admin.inc
--- modules/menu/menu.admin.inc	7 Jun 2009 02:30:13 -0000	1.49
+++ modules/menu/menu.admin.inc	27 Jun 2009 15:07:20 -0000
@@ -669,26 +669,5 @@ function menu_configure() {
     '#description' => t('Choose the menu to be the default in the menu options in the content authoring form.'),
   );
 
-  $main = variable_get('menu_main_links_source', 'main-menu');
-  $main_options = array_merge($menu_options, array('' => t('No Main links')));
-  $form['menu_main_links_source'] = array(
-    '#type' => 'select',
-    '#title' => t('Source for the Main links'),
-    '#default_value' => 'main-menu',
-    '#options' => $main_options,
-    '#tree' => FALSE,
-    '#description' => t('Select what should be displayed as the Main links (typically at the top of the page).'),
-  );
-
-  $secondary_options = array_merge($menu_options, array('' => t('No Secondary links')));
-  $form["menu_secondary_links_source"] = array(
-    '#type' => 'select',
-    '#title' => t('Source for the Secondary links'),
-    '#default_value' => 'user-menu',
-    '#options' => $secondary_options,
-    '#tree' => FALSE,
-    '#description' => t("Select the source for the Secondary links. An advanced option allows you to use the same source for both Main links (currently %main) and Secondary links: if your source menu has two levels of hierarchy, the top level menu links will appear in the Main links, and the children of the active link will appear in the Secondary links." , array('%main' => $main_options[$main])),
-  );
-
   return system_settings_form($form, TRUE);
 }
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.23
diff -u -p -r1.23 page.tpl.php
--- modules/system/page.tpl.php	18 Jun 2009 21:19:02 -0000	1.23
+++ modules/system/page.tpl.php	27 Jun 2009 15:07:23 -0000
@@ -146,12 +146,6 @@
 
     </div></div> <!-- /.section, /#header -->
 
-    <?php if ($main_menu): ?>
-      <div id="navigation"><div class="section">
-        <?php print theme('links', $main_menu, array('id' => 'main-menu', 'class' => 'links clearfix')); ?>
-      </div></div> <!-- /.section, /#navigation -->
-    <?php endif; ?>
-
     <?php if ($breadcrumb): ?>
       <div id="breadcrumb"><?php print $breadcrumb; ?></div>
     <?php endif; ?>
@@ -186,7 +180,6 @@
     </div></div> <!-- /#main, /#main-wrapper -->
 
     <div id="footer"><div class="section">
-      <?php print theme('links', $secondary_menu, array('id' => 'secondary-menu', 'class' => 'links clearfix')); ?>
       <?php if ($footer): ?><div id="footer-region" class="region"><?php print $footer; ?></div><?php endif; ?>
     </div></div> <!-- /.section, /#footer -->
 
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.158
diff -u -p -r1.158 system.admin.inc
--- modules/system/system.admin.inc	19 Jun 2009 20:35:05 -0000	1.158
+++ modules/system/system.admin.inc	27 Jun 2009 15:07:23 -0000
@@ -375,8 +375,6 @@ function system_theme_settings(&$form_st
     'comment_user_verification' => t('User verification status in comments'),
     'search'                    => t('Search box'),
     'favicon'                   => t('Shortcut icon'),
-    'main_menu'                 => t('Main menu'),
-    'secondary_menu'            => t('Secondary menu'),
   );
 
   // Some features are not always available
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.347
diff -u -p -r1.347 system.install
--- modules/system/system.install	22 Jun 2009 13:21:37 -0000	1.347
+++ modules/system/system.install	27 Jun 2009 15:07:25 -0000
@@ -2128,6 +2128,15 @@ function system_update_7028() {
   return $ret;
 }
 
+/**
+ * Remove primary and secondary links variables.
+ */
+function system_update_7029() {
+  variable_del('menu_main_links_source');
+  variable_del('menu_secondary_links_source');
+  return array();
+}
+
 
 
 /**
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.27
diff -u -p -r1.27 page.tpl.php
--- themes/garland/page.tpl.php	28 May 2009 16:44:07 -0000	1.27
+++ themes/garland/page.tpl.php	27 Jun 2009 15:07:31 -0000
@@ -32,8 +32,6 @@
         <?php endif; ?>
         </div>
 
-        <?php if ($primary_nav): print $primary_nav; endif; ?>
-        <?php if ($secondary_nav): print $secondary_nav; endif; ?>
       </div> <!-- /#header -->
 
       <?php if ($left): ?>
Index: themes/garland/print.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/print.css,v
retrieving revision 1.7
diff -u -p -r1.7 print.css
--- themes/garland/print.css	25 Jun 2008 09:12:25 -0000	1.7
+++ themes/garland/print.css	27 Jun 2009 15:07:31 -0000
@@ -7,7 +7,6 @@ body, input, textarea, select {
   font-size: 11pt;
 }
 
-ul.main-menu, ul.secondary-menu,
 #header-region, .sidebar {
   display: none;
 }
Index: themes/garland/style-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style-rtl.css,v
retrieving revision 1.13
diff -u -p -r1.13 style-rtl.css
--- themes/garland/style-rtl.css	3 Jun 2009 06:58:57 -0000	1.13
+++ themes/garland/style-rtl.css	27 Jun 2009 15:07:31 -0000
@@ -107,31 +107,6 @@ dl dd {
   z-index: 3;
 }
 
-/**
- * Primary navigation
- */
-ul.main-menu {
-  float: left;
-width:70%;
-}
-
-ul.main-menu li {
-  float: right;
-}
-
-/**
- * Secondary navigation
- */
-ul.secondary-menu {
-  float: left;
-  clear: left;
-  margin-left: 16em;
-}
-
-ul.secondary-menu li {
-  float: right;
-}
-
 ul.primary {
   float: right;
 }
Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.58
diff -u -p -r1.58 style.css
--- themes/garland/style.css	20 Jun 2009 07:40:36 -0000	1.58
+++ themes/garland/style.css	27 Jun 2009 15:07:32 -0000
@@ -528,69 +528,6 @@ body.two-sidebars #footer {
 }
 
 /**
- * Primary navigation
- */
-ul.main-menu {
-  margin: 0;
-  padding: 0;
-  float: right; /* LTR */
-  position: relative;
-  z-index: 4;
-}
-
-ul.main-menu li {
-  margin: 0;
-  padding: 0;
-  float: left; /* LTR */
-  background-image: none;
-}
-
-ul.main-menu li a, ul.main-menu li a:link, ul.main-menu li a:visited {
-  display: block;
-  margin: 0 1em;
-  padding: .75em 0 0;
-  color: #fff;
-  background: transparent url(images/bg-navigation-item.png) no-repeat 50% 0;
-}
-
-ul.main-menu li a:hover, ul.main-menu li a.active {
-  color: #fff;
-  background: transparent url(images/bg-navigation-item-hover.png) no-repeat 50% 0;
-}
-
-/**
- * Secondary navigation
- */
-ul.secondary-menu {
-  margin: 0;
-  padding: 18px 0 0;
-  float: right; /* LTR */
-  clear: right; /* LTR */
-  position: relative;
-  z-index: 4;
-}
-
-ul.secondary-menu li {
-  margin: 0;
-  padding: 0;
-  float: left; /* LTR */
-  background-image: none;
-}
-
-ul.secondary-menu li a, ul.secondary-menu li a:link, ul.secondary-menu li a:visited {
-  display: block;
-  margin: 0 1em;
-  padding: .75em 0 0;
-  color: #cde3f1;
-  background: transparent;
-}
-
-ul.secondary-menu li a:hover, ul.secondary-menu li a.active {
-  color: #cde3f1;
-  background: transparent;
-}
-
-/**
  * Local tasks
  */
 ul.primary, ul.primary li, ul.secondary, ul.secondary li {
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.22
diff -u -p -r1.22 template.php
--- themes/garland/template.php	2 Jun 2009 03:57:22 -0000	1.22
+++ themes/garland/template.php	27 Jun 2009 15:07:32 -0000
@@ -31,8 +31,6 @@ function garland_comment_wrapper($conten
  */
 function garland_preprocess_page(&$vars) {
   $vars['tabs2'] = menu_secondary_local_tasks();
-  $vars['primary_nav'] = isset($vars['main_menu']) ? theme('links', $vars['main_menu'], array('class' => 'links main-menu')) : FALSE;
-  $vars['secondary_nav'] = isset($vars['secondary_menu']) ? theme('links', $vars['secondary_menu'], array('class' => 'links secondary-menu')) : FALSE;
   $vars['ie_styles'] = garland_get_ie_styles();
 
   // Prepare header