Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r9cb49c5c64919ebee4c5230be002beadb2af932f -r7ced9db5725f36fd33877261bd003223b2f834f1
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r9cb49c5c64919ebee4c5230be002beadb2af932f -r7ced9db5725f36fd33877261bd003223b2f834f1
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -r9cb49c5c64919ebee4c5230be002beadb2af932f -r7ced9db5725f36fd33877261bd003223b2f834f1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 9cb49c5c64919ebee4c5230be002beadb2af932f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 7ced9db5725f36fd33877261bd003223b2f834f1)
@@ -462,6 +462,9 @@
 	private function removeActivity(a:Activity, cm):Boolean{
 		if(!cm.isActiveView(this) && !cm.findParent(a, activity)) return false;
 		
+		if(a.isBranchingActivity())
+			cm.activitiesDisplayed.get(a.activityUIID).branchView.removeMovieClip();
+		
 		var r = cm.activitiesDisplayed.remove(a.activityUIID);
 		r.removeMovieClip();
 		var s:Boolean = (r==null) ? false : true;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
diff -u -r9cb49c5c64919ebee4c5230be002beadb2af932f -r7ced9db5725f36fd33877261bd003223b2f834f1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 9cb49c5c64919ebee4c5230be002beadb2af932f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(.../CanvasHelper.as)	(revision 7ced9db5725f36fd33877261bd003223b2f834f1)
@@ -178,13 +178,17 @@
 			checkReadOnlyDesign();
 			
 			if(canvasModel.activeView instanceof CanvasBranchView) {
-				canvasModel.activeView.removeMovieClip();
-				closeBranchView();
+				canvasModel.activeView.removeMovieClip();
+				closeBranchView();
+				canvasModel.getCanvas().addBin(canvasModel.activeView);
+				
+				canvasModel.broadcastViewUpdate("SIZE");
 			}
 			
 			canvasModel.selectedItem = null;
 			canvasModel.setDirty();
-			
+			
+			canvasModel.clearAllElements();
 			createContentFolder();
 			
 			return true;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r9cb49c5c64919ebee4c5230be002beadb2af932f -r7ced9db5725f36fd33877261bd003223b2f834f1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 9cb49c5c64919ebee4c5230be002beadb2af932f)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 7ced9db5725f36fd33877261bd003223b2f834f1)
@@ -1085,7 +1085,7 @@
 			}else if(r_activity == "DELETE"){
 				//remove this activity
 				if(cm_activity.parentUIID == null){
-					broadcastViewUpdate("REMOVE_ACTIVITY",cm_activity);
+					broadcastViewUpdate("REMOVE_ACTIVITY", cm_activity);
 				}
 			}else if(r_activity == "CHILD"){
 				//dont ask the view to draw the activity if it is a child act				
@@ -1546,4 +1546,53 @@
 		else
 			return findParent(_cv.ddm.getActivityByUIID(a.parentUIID), b);
     }
+	
+	public function clearAllBranches(a:Activity):Void {
+		var branch_keys:Array = _branchesDisplayed.keys();
+		var act_keys:Array = _activitiesDisplayed.keys();
+		Debugger.log("clearing branches: " + branch_keys.length, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
+		
+			
+		for(var i=0; i<branch_keys.length; i++) {
+			var branch:Branch = _branchesDisplayed.get(branch_keys[i]).branch;
+			
+			Debugger.log("branch: " + branch.branchUIID, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
+		
+			if(branch.sequenceActivity.parentUIID == a.activityUIID) {
+				for(var j=0; j<act_keys.length; j++) {
+					
+					Debugger.log("activity parent: " + _activitiesDisplayed.get(act_keys[i]).activity.parentUIID, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
+					Debugger.log("seq uiid: " + branch.sequenceActivity.activityUIID, Debugger.CRITICAL, "clearAllBranches", "CanvasModel");
+					
+					if(_activitiesDisplayed.get(act_keys[i]).activity.parentUIID == branch.sequenceActivity.activityUIID) {
+						_activitiesDisplayed.remove(act_keys[i]);
+					}
+		
+				}
+			}
+		}
+		
+	}
+	
+	public function clearAllElements():Void {
+		var branch_keys:Array = _branchesDisplayed.keys();
+		var act_keys:Array = _activitiesDisplayed.keys();
+		var trans_keys:Array = _transitionsDisplayed.keys();
+		
+		for(var i=0; i<branch_keys.length; i++)
+			_branchesDisplayed.get(branch_keys[i]).removeMovieClip();
+		for(var i=0; i<trans_keys.length; i++)
+			_transitionsDisplayed.get(trans_keys[i]).removeMovieClip();
+		for(var i=0; i<act_keys.length; i++) {
+			if(_activitiesDisplayed.get(act_keys[i]).activity.isBranchingActivity())
+				_activitiesDisplayed.get(act_keys[i]).branchView.removeMovieClip();
+			_activitiesDisplayed.get(act_keys[i]).removeMovieClip();
+			
+		}
+		
+		_branchesDisplayed.clear();
+		_transitionsDisplayed.clear();
+		_activitiesDisplayed.clear();
+		
+	}
 }
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -r245728d04c9feab340685e9d94b5623e0f9a1d74 -r7ced9db5725f36fd33877261bd003223b2f834f1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 245728d04c9feab340685e9d94b5623e0f9a1d74)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 7ced9db5725f36fd33877261bd003223b2f834f1)
@@ -347,6 +347,12 @@
 	private function removeActivity(a:Activity,cm:CanvasModel):Boolean{
 		if(!cm.isActiveView(this)) return false;
 		
+		if(a.isBranchingActivity()) {
+			Debugger.log("removing Branching Activity: " + a.title, Debugger.CRITICAL, "removeActivity", "CanvasView");
+			cm.clearAllBranches(a);
+			cm.activitiesDisplayed.get(a.activityUIID).branchView.removeMovieClip();
+		}
+		
 		var r = cm.activitiesDisplayed.remove(a.activityUIID);
 		r.removeMovieClip();
 		var s:Boolean = (r==null) ? false : true;