diff --git a/booking.rooms.inc b/booking.rooms.inc
index 7eb4348..a742d88 100644
--- a/booking.rooms.inc
+++ b/booking.rooms.inc
@@ -176,15 +176,16 @@ function booking_room_edit_form($node, &$form_state, $nid) {
 		'#value' => $nid,
 	);	
 
+	$form['remove'] = array (
+		'#type' => 'submit',
+		'#value' => t('Remove'),
+	);
+
 	$form['submit'] = array (
 		'#type' => 'submit',
 		'#value' => t('Submit'),
 	);
-	$form['remove'] = array (
-		'#type' => 'submit',
-		'#value' => t('Remove'),
-	);	
-
+	
 	return array (
 		'first_para' => array (
 			'#type' => 'markup',
diff --git a/booking.rooms_admin.inc b/booking.rooms_admin.inc
index 5f3569a..c7fc96b 100644
--- a/booking.rooms_admin.inc
+++ b/booking.rooms_admin.inc
@@ -140,10 +140,6 @@ function booking_roomlocation_define_form_submit($form, &$form_state) {
 	$values = $form_state['input'];
 	$redirect_path = array('admin/config/booking/rooms');
 	$new_count = 0;
-	
-	//get the number of study groups before making this update
-	//$count = db_query("SELECT count(*) as num FROM {booking_studygroup_list} WHERE booking_eventid = :eid",
-	//	array(':eid' => $event->eid))->fetchObject();
 
 	//watchdog('booking', 'Checkboxes when setting buttons: @info', array ('@info' => var_export($checkboxes, TRUE)));		
 	if ($form_state['values']['op'] == 'Create')