diff -r -up migrate/migrate.module oceaniceagles/sites/default/modules/migrate/migrate.module
--- migrate/migrate.module	2010-01-29 08:17:23.000000000 +1030
+++ oceaniceagles/sites/default/modules/migrate/migrate.module	2010-02-21 00:22:35.000000000 +1030
@@ -400,10 +400,10 @@ function migrate_content_process_clear($
                       $options['feedback']['frequency_unit'] : NULL;
   }
 
-  $result = db_query("SELECT *
-                      FROM {migrate_content_sets}
-                      WHERE mcsid=%d", $mcsid);
-  $tblinfo = db_fetch_object($result);
+  $tblinfo = db_fetch_object(db_query("SELECT *
+                                   FROM {migrate_content_sets}
+                                   WHERE mcsid=%d",
+                                  $mcsid));
   $description = $tblinfo->description;
   if ($tblinfo->status != MIGRATE_STATUS_IDLE) {
     return MIGRATE_RESULT_IN_PROGRESS;
@@ -420,7 +420,9 @@ function migrate_content_process_clear($
   $msgtablename = migrate_message_table_name($mcsid);
   $processstart = microtime(TRUE);
   $memory_limit = _migrate_memory_limit();
-
+  
+  $tblinfo->maptable = $maptable;
+  
   // If this content set is set up to update existing content, we don't
   // want to delete the content on clear, just the map/message tables
   $sql = "SELECT srcfield FROM {migrate_content_mappings}
@@ -491,7 +493,7 @@ function migrate_content_process_clear($
     // @TODO: Should return success/failure. Problem: node_delete doesn't return anything...
     if ($full_clear) {
       timer_start('delete hooks');
-      migrate_invoke_all("delete_$contenttype", $row->destid);
+      migrate_invoke_all("delete_$contenttype", $tblinfo, $row->destid);
       timer_stop('delete hooks');
     }
     timer_start('clear map/msg');
diff -r -up migrate/modules/comment.migrate.inc oceaniceagles/sites/default/modules/migrate/modules/comment.migrate.inc
--- migrate/modules/comment.migrate.inc	2010-01-30 09:05:21.000000000 +1030
+++ oceaniceagles/sites/default/modules/migrate/modules/comment.migrate.inc	2010-02-20 23:46:27.000000000 +1030
@@ -42,7 +42,7 @@ function comment_migrate_fields_comment(
 /**
  * Implementation of hook_migrate_delete_comment().
  */
-function comment_migrate_delete_comment($cid) {
+function comment_migrate_delete_comment($tblinfo, $cid) {
   $path = drupal_get_path('module', 'comment') . '/comment.admin.inc';
   include_once($path);
   // Backdoor deletion - query stolen from comment_delete()
diff -r -up migrate/modules/node.migrate.inc oceaniceagles/sites/default/modules/migrate/modules/node.migrate.inc
--- migrate/modules/node.migrate.inc	2010-02-01 02:22:24.000000000 +1030
+++ oceaniceagles/sites/default/modules/migrate/modules/node.migrate.inc	2010-02-20 23:46:15.000000000 +1030
@@ -25,7 +25,7 @@ function node_migrate_types() {
 /**
  * Implementation of hook_migrate_delete_node().
  */
-function node_migrate_delete_node($nid) {
+function node_migrate_delete_node($tblinfo, $nid) {
   // If we've created associations in {upload} between imported nodes
   // and files directly copied to the Drupal files directory (e.g. using
   // the auditfiles module), deleting the nodes deletes the files (not
diff -r -up migrate/modules/taxonomy.migrate.inc oceaniceagles/sites/default/modules/migrate/modules/taxonomy.migrate.inc
--- migrate/modules/taxonomy.migrate.inc	2010-01-13 14:35:41.000000000 +1030
+++ oceaniceagles/sites/default/modules/migrate/modules/taxonomy.migrate.inc	2010-02-20 23:45:41.000000000 +1030
@@ -44,7 +44,7 @@ function taxonomy_migrate_fields_node($t
 /**
  * Implementation of hook_migrate_delete_term().
  */
-function taxonomy_migrate_delete_term($tid) {
+function taxonomy_migrate_delete_term($tblinfo, $tid) {
   taxonomy_del_term($tid);
 }
 
diff -r -up migrate/modules/user.migrate.inc oceaniceagles/sites/default/modules/migrate/modules/user.migrate.inc
--- migrate/modules/user.migrate.inc	2010-01-13 14:35:41.000000000 +1030
+++ oceaniceagles/sites/default/modules/migrate/modules/user.migrate.inc	2010-02-21 01:02:54.000000000 +1030
@@ -36,7 +36,7 @@ function user_migrate_fields_user($type)
 /**
  * Implementation of hook_migrate_delete_user().
  */
-function user_migrate_delete_user($uid) {
+function user_migrate_delete_user($tblinfo, $uid) {
   timer_start('user_delete');
   user_delete(array(), $uid);
   timer_stop('user_delete');
@@ -193,7 +193,7 @@ function user_migrate_fields_role($type)
 /**
  * Implementation of hook_migrate_delete_role().
  */
-function user_migrate_delete_role($rid) {
+function user_migrate_delete_role($tblinfo, $rid) {
   timer_start('role_delete');
 
   db_query('DELETE FROM {users_roles} WHERE rid = %d', $rid);