Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r8499a7e0ba9d82c35d27fa14f41428003fe427ce -ra46e2d9c7a400776444c4e6599b8b2edc2d28c9c
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r000252a8a877c3606ad4d8613a88895f41fef890 -ra46e2d9c7a400776444c4e6599b8b2edc2d28c9c
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r8499a7e0ba9d82c35d27fa14f41428003fe427ce -ra46e2d9c7a400776444c4e6599b8b2edc2d28c9c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 8499a7e0ba9d82c35d27fa14f41428003fe427ce)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision a46e2d9c7a400776444c4e6599b8b2edc2d28c9c)
@@ -998,18 +998,23 @@
 	public function getBranchMappingsByActivityUIIDAndType(activityUIID:Number):Object {
 		var bMappings:Array = _branchMappings.values();
 		var myMappings:Object = new Object();
+		
 		myMappings.groupBased = new Array();
 		myMappings.toolBased = new Array();
 		myMappings.uncategorised = new Array();
+		myMappings.all = new Array();
 		
-		for(var i=0; i<bMappings.length; i++) {
-			if(bMappings[i] instanceof GroupBranchActivityEntry)	
+		for(var i=0; i<bMappings.length; i++)
+			if(bMappings[i].branchingActivity.activityUIID == activityUIID) {
+				if(bMappings[i] instanceof GroupBranchActivityEntry)	
 					myMappings.groupBased.push(bMappings[i]);
-			else if(bMappings[i] instanceof ToolOutputBranchActivityEntry)
-				myMappings.toolBased.push(bMappings[i]);
-			else 
-				myMappings.uncategorised.push(bMappings[i]);
-		}
+				else if(bMappings[i] instanceof ToolOutputBranchActivityEntry)
+					myMappings.toolBased.push(bMappings[i]);
+				else 
+					myMappings.uncategorised.push(bMappings[i]);
+				
+				myMappings.all.push(bMappings[i]);
+			}
 		
 		return myMappings;
 	}
@@ -1210,7 +1215,7 @@
 		
 	}
 	
-	private function removeEntries(e:Array) {
+	public function removeEntries(e:Array) {
 		for(var i=0; i<e.length; i++)
 			if(e[i] instanceof Array)
 				removeEntries(e[i]);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r8499a7e0ba9d82c35d27fa14f41428003fe427ce -ra46e2d9c7a400776444c4e6599b8b2edc2d28c9c
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 8499a7e0ba9d82c35d27fa14f41428003fe427ce)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision a46e2d9c7a400776444c4e6599b8b2edc2d28c9c)
@@ -562,6 +562,9 @@
 			if(!isActivityReadOnly(ca, Dictionary.getValue("cv_element_readOnly_action_del")) && !ca.branchConnector && !isActivityProtected(ca)) {
 				if (ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.OPTIONS_WITH_SEQUENCES_TYPE || ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || ca.activity.isBranchingActivity()){
 					Debugger.log("removing complex act that hit bin" , Debugger.CRITICAL, "isActivityOnBin", "CanvasController");
+					if(ca.activity.isBranchingActivity())
+						_canvasModel.getCanvas().ddm.removeEntries(_canvasModel.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(ca.activity.activityUIID).all);
+					
 					_canvasModel.removeComplexActivity(ca);
 				} else {
 					_canvasModel.removeActivityOnBin(ca.activity.activityUIID);