diff -up audio audio.admin.inc.old audio /audio.admin.inc.new
--- audio.admin.inc	2008-05-25 18:10:50.000000000 -0500
+++ audio.admin.inc	2009-03-31 14:33:40.000000000 -0500
@@ -126,7 +126,10 @@ function audio_admin_settings_metadata()
     '#default_value' => 0,
   );
 
-  return system_settings_form($form);
+  $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') );
+  $form['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') );
+
+  return $form;
 }
 
 /**
@@ -143,9 +146,9 @@ function audio_admin_settings_metadata_s
   }
   else {
     // Remove any deleted tags.
-    foreach ($form_state['values']['delete'] as $field) {
-      if ($field) {
-        unset($form_state['values']['audio_tag_settings'][$field]);
+    foreach ($form_state['values']['audio_tag_settings'] as $name => $field) {
+      if ($form_state['values']['audio_tag_settings'][$name]['delete']) {
+        unset($form_state['values']['audio_tag_settings'][$name]);
       }
     }
     // If there's a new tag, add it in.
@@ -196,7 +199,11 @@ function theme_audio_admin_settings_meta
   $header = array(t('Tag'), t('Autocompleted'), t('Required'), t('Hidden'), t('Browsable'),
     t('Written to file'), t('Weight'), t('Delete'));
 
-  $output = theme('table', $header, $rows);
+  $rows = array_filter($rows);
+  $output = "";
+  if (!empty($rows)) {
+    $output .= theme('table', $header, $rows);
+  }
   $output .= drupal_render($form_element);
   return $output;
 }