Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java,v
diff -u -r1.57 -r1.58
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	28 Sep 2007 03:19:55 -0000	1.57
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	15 Oct 2007 02:03:16 -0000	1.58
@@ -1256,14 +1256,19 @@
 	    }
 	    
 	    // now go through and delete any old branch mappings that are no longer used.
-	    // need to remove them via the sequence activity so that the cascade will work.
+	    // need to remove them from their collections to make sure it isn't accidently re-added.
 	    Iterator iter = oldbranchActivityEntryList.iterator();
 	    while (iter.hasNext()) {
 			BranchActivityEntry oldEntry = (BranchActivityEntry) iter.next();
 			SequenceActivity sequenceActivity = oldEntry.getBranchSequenceActivity();
 			if ( sequenceActivity != null ) {
 				sequenceActivity.getBranchEntries().remove(oldEntry);
 			}
+			Group group = oldEntry.getGroup();
+			if (group != null ) {
+				group.getBranchActivities().remove(oldEntry);
+			}
+			activityDAO.delete(oldEntry);
 		}
 	}