--- me/me.module.ORIG	2008-12-25 01:59:11.000000000 +0100
+++ me/me.module	2008-12-26 16:57:28.000000000 +0100
@@ -137,37 +137,37 @@ function me_menu() {
     'type' => MENU_NORMAL_ITEM,
   );
 
-  // TODO: Remove when/if http://drupal.org/node/109588 gets in.
-  $items['user/'. variable_get('me_alias', 'me') .'/edit'] = array(
-    'title' => 'Edit',
-    'page callback' => 'me_user_edit',
-    'access callback' => 'me_user_edit_access',
-    'type' => MENU_LOCAL_TASK,
-  );
+//  // TODO: Remove when/if http://drupal.org/node/109588 gets in.
+//  $items['user/'. variable_get('me_alias', 'me') .'/edit'] = array(
+//    'title' => 'Edit',
+//    'page callback' => 'me_user_edit',
+//    'access callback' => 'me_user_edit_access',
+//    'type' => MENU_LOCAL_TASK,
+//  );
 
   return $items;
 }
 
-/**
- * Menu callback to redirect to the user edit pages with the correct
- * user id.
- *
- * TODO: Remove when/if http://drupal.org/node/109588 gets in.
- */
-function me_user_edit() {
-  drupal_goto('user/'. $GLOBALS['user']->uid .'/edit');
-}
-
-/**
- * Menu access callback to check access before user edit redirection
- * takes place. This keeps 'me' in the path when access will be denied
- * anyway, and saves an extra request.
- *
- * TODO: Remove when/if http://drupal.org/node/109588 gets in.
- */
-function me_user_edit_access() {
-  return user_edit_access($GLOBALS['user']);
-}
+// /**
+//  * Menu callback to redirect to the user edit pages with the correct
+//  * user id.
+//  *
+//  * TODO: Remove when/if http://drupal.org/node/109588 gets in.
+//  */
+// function me_user_edit() {
+//   drupal_goto('user/'. $GLOBALS['user']->uid .'/edit');
+// }
+
+// /**
+//  * Menu access callback to check access before user edit redirection
+//  * takes place. This keeps 'me' in the path when access will be denied
+//  * anyway, and saves an extra request.
+//  *
+//  * TODO: Remove when/if http://drupal.org/node/109588 gets in.
+//  */
+// function me_user_edit_access() {
+//   return user_edit_access($GLOBALS['user']);
+// }
 
 /**
  * Form callback for the admin settings form.
@@ -193,8 +193,8 @@ function me_admin_settings_form(&$form_s
 
   $form['#validate'] = array('me_admin_settings_form_validate');
 
-  // TODO: Remove submit callback when/if http://drupal.org/node/109588 gets in.
-  $form['#submit'] = array('me_admin_settings_form_submit');
+//   // TODO: Remove submit callback when/if http://drupal.org/node/109588 gets in.
+//   $form['#submit'] = array('me_admin_settings_form_submit');
 
   return system_settings_form($form);
 }
@@ -208,13 +208,13 @@ function me_admin_settings_form_validate
   }
 }
 
-/**
- * SUbmit callback for me_admin_settings_form.
- *
- * TODO: Remove when/if http://drupal.org/node/109588 gets in.
- */
-function me_admin_settings_form_submit($form, &$form_state) {
-  // When/if the me alias changes, we need to rebuild the menu so the
-  // new alias is picked up on the user edit pages correctly.
-  menu_rebuild();
-}
+// /**
+//  * SUbmit callback for me_admin_settings_form.
+//  *
+//  * TODO: Remove when/if http://drupal.org/node/109588 gets in.
+//  */
+// function me_admin_settings_form_submit($form, &$form_state) {
+//   // When/if the me alias changes, we need to rebuild the menu so the
+//   // new alias is picked up on the user edit pages correctly.
+//   menu_rebuild();
+// }