diff --git a/booking.emails_admin.inc b/booking.emails_admin.inc
index 786e60f..d04a2bd 100644
--- a/booking.emails_admin.inc
+++ b/booking.emails_admin.inc
@@ -244,66 +244,6 @@ function booking_emails_workflow_admin() {
     '#format' => $form_format,      
   );
 
-  /*Text for emails*/
-  /*
-  $form['custom-emails'] = array(
-    '#type' => 'fieldset',
-    '#title' => 'Custom Email Text Definitions',
-    '#collapsible' => TRUE, 
-    '#collapsed' => TRUE,
-  );
-  
-  //add a bunch of custom emails
-  for ($i = 1; $i <= variable_get('booking_custom_email_count','5'); $i++) {
-    $subject_fieldname = 'booking_email_subject_custom' . $i;
-    $body_fieldname = 'booking_email_custom' . $i;
-    $form['custom-emails'][$subject_fieldname] = array (
-      '#type' => 'textfield',
-      '#title' => t('Subject line for Custom Email ' . $i),
-      '#size' => 150,	
-      '#maxlength' => 300,
-      '#default_value' => variable_get($subject_fieldname,'[booking:eventname]'),
-    );
-    $form['custom-emails'][$body_fieldname] = array(
-      '#title' => t('Email text for custom email ' . $i),
-      '#description' => t(''),      
-      '#default_value' => isset(variable_get($body_fieldname)['value']) ? variable_get($body_fieldname)['value'] : variable_get($body_fieldname, ''),
-      '#type' => $form_type,
-      '#format' => $form_format,        
-    );		
-  }  
-  */
-
-  /*Text for logistics emails*/
-  /*
-  $form['custom-logistics-emails'] = array(
-    '#type' => 'fieldset',
-    '#title' => 'Custom Logistics Email Text Definitions',
-    '#collapsible' => TRUE, 
-    '#collapsed' => TRUE,
-  );
-  
-  //add a bunch of custom emails
-  //@todo add an admin variable for this
-  for ($i = 1; $i <= 5; $i++) {
-    $subject_fieldname = 'booking_email_subject_customlogistics' . $i;
-    $body_fieldname = 'booking_email_customlogistics' . $i;
-    $form['custom-logistics-emails'][$subject_fieldname] = array (
-      '#type' => 'textfield',
-      '#title' => t('Subject line for Logistics Custom Email ' . $i),
-      '#size' => 150,	
-      '#maxlength' => 300,
-      '#default_value' => variable_get($subject_fieldname,'[booking:eventname] Logistics'),
-    );
-    $form['custom-logistics-emails'][$body_fieldname] = array(
-      '#title' => t('Email text for Logistics Custom Email ' . $i),
-      '#description' => t(''),
-      '#default_value' => isset(variable_get($body_fieldname)['value']) ? variable_get($body_fieldname)['value'] : variable_get($body_fieldname, ''),
-      '#type' => $form_type,
-      '#format' => $form_format,  
-    );		
-  }    
-  */
   //let the builtin hook do all the hard work
   return system_settings_form($form, FALSE);  
 }
diff --git a/booking.regn_node.inc b/booking.regn_node.inc
index e47dcfa..4e82060 100644
--- a/booking.regn_node.inc
+++ b/booking.regn_node.inc
@@ -798,7 +798,7 @@ function _booking_waitinglist_update_trigger()
 	$counter = 1;
 
 	foreach ($waiting_list as $person) {
-		watchdog('booking_debug', "Updating node !nid to have waitlist position of !counter", array('!nid' => $person->nid, '!counter' => $counter));
+		//watchdog('booking_debug', "Updating node !nid to have waitlist position of !counter", array('!nid' => $person->nid, '!counter' => $counter));
 		db_update('booking_person')
 		  ->fields(array(
 				'booking_waitlist_pos' => $counter++,