--- ed_classified.install_old	2007-06-04 20:25:14.000000000 -0700
+++ ed_classified.install	2007-09-22 00:51:14.000000000 -0700
@@ -33,20 +33,33 @@ function ed_classified_install() {
 
 }
 
-function ed_classified_init_taxonomy() {
+/*function ed_classified_init_taxonomy() {
    drupal_set_message(t('Creating classified ads taxonomy terms'));
    $vid = _ed_classified_get_vid(); // create taxonomy terms.
    drupal_set_message(t('Classified ad taxonomy %vid created.', array('%vid'=>$vid)));
    $items=array();
    $items[] = true;
    return $items;
-}
+} */
 
+include_once(drupal_get_path('module', 'ed_classified').'/ed_classified_defaults.inc');
 /**
 * Implementation of hook_uninstall().
 */
 function ed_classified_uninstall() {
-  db_query('DROP TABLE {edi_classified_nodes};');
-  db_query('DELETE FROM {variable} WHERE name LIKE "ed_classified%";');
-}
 
+  // removes the taxonomy vocabulary related to this module.
+  if ($vid = _ed_classified_variable_get('vocabulary', FALSE)) {
+    taxonomy_del_vocabulary($vid);
+  }
+
+
+// db_query("DELETE FROM {variable} WHERE name LIKE '%s%'", EDI_CLASSIFIED_MODULE_NAME);
+  $result = db_query("SELECT name FROM {variable} WHERE name LIKE '%s%'", EDI_CLASSIFIED_MODULE_NAME);
+  while ($vars = db_fetch_object($result)) {
+    variable_del($vars->name);
+  }
+
+  db_query('DROP TABLE {edi_classified_nodes}');
+
+}
\ No newline at end of file