--- picasa_photo/picasa_photo.module	Fri Aug 01 19:24:34 2008
+++ picasa_photo/picasa_photo.module	Thu May 29 11:29:37 2008
@@ -16,7 +16,7 @@
  *   The node being deleted.
  */
 function picasa_photo_delete(&$node) {
+  db_query('DELETE FROM {picasa_photos} WHERE nid = %d AND vid =%d', 
-  db_query('DELETE FROM {picasa_albums} WHERE nid = %d AND vid =%d', 
     $node->nid, $node->vid);
 }
  
--- picasa_guser/picasa_guser.module	Fri Aug 01 19:24:34 2008
+++ picasa_guser/picasa_guser.module	Thu May 29 11:29:37 2008
@@ -30,11 +30,7 @@
   global $user;
   // Delete the related information we were saving for this node.
   db_query('DELETE FROM {picasa_gusers} WHERE nid = %d', $node->nid);
+  $sql = "SELECT nid FROM {picasa_albums} WHERE guser_nid = '%d'";
+  $result = db_query($sql,$node->nid);
+  while($row = db_fetch_object($result)) {
+    node_delete($row->nid);
+  }
-  db_query('DELETE FROM {picasa_albums} WHERE uid = %d', $node->uid);
 }
 
 /**
@@ -320,11 +316,7 @@
       $guser->opensearch_items_per_page, $guser->gphoto_user,
       $guser->gphoto_nickname, $guser->gphoto_thumbnail, $node->nid, 
       $node->vid);
+    $sql = "SELECT nid FROM {picasa_albums} WHERE guser_nid = '%d'";
+    $result = db_query($sql,$node->nid);
+    while($row = db_fetch_object($result)) {
+      node_delete($row->nid);
+    }
-    picasa_album_delete($node);
     picasa_album_insert_batch($node, $guser);
   }
  }
--- picasa_album/picasa_album.module	Fri Aug 01 19:31:46 2008
+++ picasa_album/picasa_album.module	Thu May 29 11:29:37 2008
@@ -18,11 +18,6 @@
 function picasa_album_delete(&$node) {
   db_query('DELETE FROM {picasa_albums} WHERE nid = %d AND vid =%d', 
     $node->nid, $node->vid);
+  $sql = "SELECT nid FROM {picasa_photos} WHERE galbum_nid = '%d'";
+  $result = db_query($sql,$node->nid);
+  while($row = db_fetch_object($result)) {
+    node_delete($row->nid);
+  }
 }
 
 /**