Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -ra46e2d9c7a400776444c4e6599b8b2edc2d28c9c -r4fd62cd151fdec92474bbb5189e507d67deba3bf
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -ra46e2d9c7a400776444c4e6599b8b2edc2d28c9c -r4fd62cd151fdec92474bbb5189e507d67deba3bf
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -ra46e2d9c7a400776444c4e6599b8b2edc2d28c9c -r4fd62cd151fdec92474bbb5189e507d67deba3bf
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision a46e2d9c7a400776444c4e6599b8b2edc2d28c9c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 4fd62cd151fdec92474bbb5189e507d67deba3bf)
@@ -374,7 +374,11 @@
 		if(r==null){
 			return new LFError("Removing branch failed:"+branchUIID,"removeBranch",this,null);
 		}else{
+			var mappings:Object = getBranchMappingsByActivityUIIDAndType(r.sequenceActivity.activityUIID)
+			Debugger.log("removing " + mappings.length + " entries", Debugger.GEN, "removeBranch", "DesignDataModel");
 			
+			removeEntries(mappings.all);
+			
 			Debugger.log('Removed:'+r.branchUIID,Debugger.GEN,'removeBranch','DesignDataModel');
 			dispatchEvent({type:'ddmUpdate',target:this});
 		}
@@ -1005,7 +1009,7 @@
 		myMappings.all = new Array();
 		
 		for(var i=0; i<bMappings.length; i++)
-			if(bMappings[i].branchingActivity.activityUIID == activityUIID) {
+			if(bMappings[i].branchingActivity.activityUIID == activityUIID || bMappings[i].sequenceActivity.activityUIID == activityUIID) {
 				if(bMappings[i] instanceof GroupBranchActivityEntry)	
 					myMappings.groupBased.push(bMappings[i]);
 				else if(bMappings[i] instanceof ToolOutputBranchActivityEntry)
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -ra46e2d9c7a400776444c4e6599b8b2edc2d28c9c -r4fd62cd151fdec92474bbb5189e507d67deba3bf
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision a46e2d9c7a400776444c4e6599b8b2edc2d28c9c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 4fd62cd151fdec92474bbb5189e507d67deba3bf)
@@ -640,8 +640,10 @@
 		Debugger.log("branchRelease Transition:" + bc.branch.branchUIID, Debugger.GEN, "branchRelease", "CanvasController");
 		if(_canvasModel.isDragging){
 			bc.stopDrag();
+			
 			if(bc.hitTest(_canvasModel.getCanvas().bin) && !isBranchTargetReadOnly(bc, Dictionary.getValue("cv_element_readOnly_action_del"))){
 				var branchesToDelete:Array;
+				
 				if(bc.branch.direction == BranchConnector.DIR_FROM_START) {
 					if(_canvasModel.activeView.activity.firstActivityUIID == bc.branch.sequenceActivity.activityUIID)
 						_canvasModel.activeView.activity.defaultBranch = _canvasModel.getCanvas().ddm.findNewDefaultBranch(_canvasModel.activeView.activity, bc.branch);