diff --git a/nodetrail.module b/nodetrail.module
index cbc8663..d97075f 100644
--- a/nodetrail.module
+++ b/nodetrail.module
@@ -31,6 +31,7 @@ function nodetrail_form_alter(&$form, $form_state, $form_id) {
     if (!isset($options[$default])) {
       $default = sprintf('%s:0', variable_get('menu_default_node_menu', 'primary-links'));
     }
+    $options = array('none:0' => t('None')) + $options;
     $form['nodetrail']['nodetrail_parent'] = array(
       '#type' => 'select',
       '#title' => t('Parent item'),
@@ -50,11 +51,14 @@ function nodetrail_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
       // decomposing parent parts
       list($menu_name, $mlid) = explode(':', $node->nodetrail_parent);
 
-      // saving menu item
-      if ($mlid) {
+      // If editing an existing node, remove any previously-set value
+      // This is necessary to clear out the previous trail if they choose to remove it
         if ($op == 'update') {
           db_query("DELETE FROM {nodetrail} WHERE nid = %d", $node->nid);
         }
+      
+      // Save the new value
+      if ($mlid) {
         db_query("INSERT INTO {nodetrail} (nid, mlid) VALUES (%d, %d)", $node->nid, $mlid);
       }
       break;