menu_block.install | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/menu_block.install b/menu_block.install
index fa25a1d..47b262f 100644
--- a/menu_block.install
+++ b/menu_block.install
@@ -8,26 +8,19 @@
  * Implements hook_uninstall().
  */
 function menu_block_uninstall() {
-  // Delete menu block variables.
-  foreach (variable_get('menu_block_ids', array()) AS $delta) {
-    variable_del("menu_block_{$delta}_title_link");
-    variable_del("menu_block_{$delta}_admin_title");
-    variable_del("menu_block_{$delta}_parent");
-    variable_del("menu_block_{$delta}_level");
-    variable_del("menu_block_{$delta}_follow");
-    variable_del("menu_block_{$delta}_depth");
-    variable_del("menu_block_{$delta}_expanded");
-    variable_del("menu_block_{$delta}_sort");
-  }
-  variable_del('menu_block_ids');
-  variable_del('menu_block_suppress_core');
-  variable_del('menu_block_menu_order');
+  // Remove all menu block configuration variables.
+  db_delete('variable')
+    ->condition('name', 'menu_block_%', 'LIKE')
+    ->execute();
 
   // Remove block configurations.
   if (module_exists('block')) {
     db_delete('block')
       ->condition('module', 'menu_block')
       ->execute();
+    db_delete('block_node_type')
+      ->condition('module', 'menu_block')
+      ->execute();
     db_delete('block_role')
       ->condition('module', 'menu_block')
       ->execute();