diff --git a/annotate.install b/annotate.install
index 139fbba..01ed513 100644
--- a/annotate.install
+++ b/annotate.install
@@ -122,9 +122,20 @@ function annotate_install() {
  * Implementation of hook_uninstall()
  */
 function annotate_uninstall() {
-  variable_del('annotate_show_expanded');
-  variable_del('annotate_nodetypes');
-  variable_del('annotate_nodetypes_multiple');
+  
+  $content_types = node_get_types();
+  
+  foreach ($content_types as $content_type) {
+    
+      $type = $content_type->type;
+      
+      variable_del('annotate_allow_' . $type);
+      variable_del('annotate_display_expanded_' . $type);
+      variable_del('annotate_allow_multiple_' . $type);
+      variable_del('annotate_display_multi_expanded_' . $type);
+      variable_del('annotate_default_visibility_' . $type);
+      variable_del('annotate_visibility_force_' . $type);
+  }
 
   drupal_uninstall_schema('annotate');
 }
\ No newline at end of file