Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r3f1fc7bcf2f21a867db18a2ef7db179cfa8ac212 -rf529b671aab92c3a3ac9d7aff0a435a71060ff61
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r3f1fc7bcf2f21a867db18a2ef7db179cfa8ac212 -rf529b671aab92c3a3ac9d7aff0a435a71060ff61
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r7c8ff663c07662a984677b2ed751754346226590 -rf529b671aab92c3a3ac9d7aff0a435a71060ff61
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision f529b671aab92c3a3ac9d7aff0a435a71060ff61)
@@ -915,6 +915,14 @@
 		}
 	}
 	
+	public function clearBranchMappingsByToolActivity(activityUIID:Number):Void {
+		var bMappings:Array = _branchMappings.values();
+		
+		for(var i=0; i<bMappings.length; i++) {
+			if(bMappings[i].condition.toolActivity == activityUIID) _branchMappings.remove(bMappings[i].entryUIID);
+		}
+	}
+	
 	public function removeBranchMappingsByGroupUIID(groupUIID:Number):Void {
 		var bMappings:Array = _branchMappings.values();
 		
@@ -1090,63 +1098,73 @@
 		var tActs:Array = getActivitiesByType(Activity.TOOL_BRANCHING_ACTIVITY_TYPE);
 		var cActs:Array = getActivitiesByType(Activity.CHOSEN_BRANCHING_ACTIVITY_TYPE);
 		
+		Debugger.log("gacts len:" + gActs.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
+		Debugger.log("tacts len:" + tActs.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
+		Debugger.log("cacts len:" + cActs.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
+		
 		var mappingsToRemove:Array = new Array();
 		
 		for(i=0; i<gActs.length; i++) {
 			var mappings:Object = getBranchMappingsByActivityUIIDAndType(gActs[i].activityUIID);
-			if(mappings.toolBased.length > 0) {
-				v = false;
-				mappingsToRemove.concat(mappings.toolBased);
-			}
 			
-			for(var j=0; j<mappings.groupBased.length; j++) {
-				if(mappings.groupBased[j].group.parentID != GroupingActivity(gActs[i]).createGroupingUIID) {
-					v = false;
+			Debugger.log("gacts mappings len tool:" + mappings.toolBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
+			Debugger.log("gacts mappings len group:" + mappings.groupBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
+			
+			if(mappings.toolBased.length > 0)
+				mappingsToRemove.push(Array(mappings.toolBased));
+
+			
+			for(var j=0; j<mappings.groupBased.length; j++)
+				if(mappings.groupBased[j].group.parentID != BranchingActivity(gActs[i]).groupingUIID)
 					mappingsToRemove.push(mappings.groupBased[j]);
-				}
-			}
+
 		}
 		
 		for(i=0; i<tActs.length; i++) {
 			var mappings:Object = getBranchMappingsByActivityUIIDAndType(gActs[i].activityUIID);
-			if(mappings.groupBased.length > 0) {
-				v = false;
-				mappingsToRemove.concat(mappings.groupBased);
-			} 
 			
-			for(var j=0; j<mappings.toolBased.length; j++) {
-				if(mappings.toolBased[j].condition.toolActivity.activityUIID != BranchingActivity(tActs[i]).toolActivityUIID) {
-					v = false;
+			Debugger.log("tacts mappings len tool:" + mappings.toolBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
+			Debugger.log("tacts mappings len group:" + mappings.groupBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
+			
+			if(mappings.groupBased.length > 0)
+				mappingsToRemove.push(Array(mappings.groupBased));
+			
+			for(var j=0; j<mappings.toolBased.length; j++)
+				if(mappings.toolBased[j].condition.toolActivity.activityUIID != BranchingActivity(tActs[i]).toolActivityUIID)
 					mappingsToRemove.push(mappings.toolBased[j]);
-				}
-			}
 		}
 		
 		for(i=0; i<cActs.length; i++) {
 			var mappings:Object = getBranchMappingsByActivityUIIDAndType(cActs[i].activityUIID);
 			
-			for(var j=0; j<mappings.groupBased.length; j++) {
-				mappingsToRemove.concat(mappings.groupBased[j]);
-				v = false;
-			}
+			Debugger.log("cacts mappings len tool:" + mappings.toolBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
+			Debugger.log("cacts mappings len group:" + mappings.groupBased.length, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
 			
-			for(var j=0; j<mappings.toolBased.length; j++) {
-				mappingsToRemove.concat(mappings.toolBased[j]);
-				v = false;
-			}
+			for(var j=0; j<mappings.groupBased.length; j++)
+				mappingsToRemove.push(Array(mappings.groupBased[j]));
+			
+			for(var j=0; j<mappings.toolBased.length; j++)
+				mappingsToRemove.push(Array(mappings.toolBased[j]));
 		}
 		
-		if(remove && !v) {
-			for(var k=0; k<mappingsToRemove.length; k++) {
-				Debugger.log("removing entry: " + mappingsToRemove[k].entryUIID, Debugger.CRITICAL, "hasRedundantBranchMappings", "DDM");
-				removeBranchMapping(mappingsToRemove[k].entryUIID);
-			}
-		}
+		if(mappingsToRemove.length > 0)
+			v = false;
 		
+		if(remove && !v)
+			removeEntries(mappingsToRemove);
+		
 		return !v;
 		
 	}
 	
+	private function removeEntries(e:Array) {
+		for(var i=0; i<e.length; i++)
+			if(e[i] instanceof Array)
+				removeEntries(e[i]);
+			else 
+				removeBranchMapping(e[i].entryUIID);
+	}
+	
 	public function removeRedundantBranchMappings(returnToSave:Function):Void {
 		Cursor.showCursor(ApplicationParent.C_HOURGLASS);
 		hasRedundantBranchMappings(true);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -r4f86eb076cd60f65046d56234985443e639c5089 -rf529b671aab92c3a3ac9d7aff0a435a71060ff61
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 4f86eb076cd60f65046d56234985443e639c5089)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision f529b671aab92c3a3ac9d7aff0a435a71060ff61)
@@ -399,7 +399,7 @@
     
 	private function isActivityOnBin(ca:Object):Void{
 		if (ca.hitTest(_canvasModel.getCanvas().bin)) {
-			if(!isActivityReadOnly(ca, Dictionary.getValue("cv_element_readOnly_action_del")) && !ca.branchConnector){
+			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.PARALLEL_ACTIVITY_TYPE){
 					_canvasModel.removeComplexActivity(ca);
 				} else {
@@ -653,6 +653,39 @@
 		}
 	}
  
+	private function isActivityProtected(ca:Object, message:String):Boolean {
+		var activity:Activity = Activity(ca.activity);
+		if(activity.isOptionalActivity() || activity.isParallelActivity()) {
+				for(var i=0; i<ca.children.length; i++)
+					if(isActivityProtected(ca.children[i], "cv_activityProtected_complex_child_msg")) return true;
+		} else if(activity.isBranchingActivity() || activity.isSequenceActivity()) {
+			var childrenActs:Array = _canvasModel.getCanvas().ddm.getComplexActivityChildren(activity.activityUIID);
+			for(var i=0; i<childrenActs.length; i++)
+				if(isActivityProtected(ca.children[i], "cv_activityProtected_complex_child_msg")) return true;
+		} else if(activity.isGroupActivity()) {
+			var gActs:Array = _canvasModel.getCanvas().ddm.getActivitiesByType(Activity.GROUP_BRANCHING_ACTIVITY_TYPE)
+				for(var i=0; i<gActs.length; i++) {
+					if(gActs[i].groupingUIID == activity.activityUIID) {
+						if(message == null) message = "cv_activityProtected_grouping_msg";
+						LFMessage.showMessageAlert(Dictionary.getValue(message), null);
+						return true;
+					}
+				}
+		} else {
+			var tActs:Array = _canvasModel.getCanvas().ddm.getActivitiesByType(Activity.TOOL_BRANCHING_ACTIVITY_TYPE)
+			
+			for(var i=0; i<tActs.length; i++) {
+				if(tActs[i].toolActivityUIID == activity.activityUIID) {
+					if(message == null) message = "cv_activityProtected_tool_msg";
+					LFMessage.showMessageAlert(Dictionary.getValue(message), null);
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+ 
 	public function openDialogLoaded(evt:Object) {
         
 		if(evt.type == 'contentLoaded'){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -rff2e6cf53af41f7a9ab89b48f5c7377db2c30f63 -rf529b671aab92c3a3ac9d7aff0a435a71060ff61
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision ff2e6cf53af41f7a9ab89b48f5c7377db2c30f63)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision f529b671aab92c3a3ac9d7aff0a435a71060ff61)
@@ -559,7 +559,7 @@
 	
 	public function removeActivity(activityUIID):Object{
 		//dispatch an event to show the design  has changed
-				
+		
 		var r:Object = _activitiesDisplayed.remove(activityUIID);
 		if(r==null){
 			return new LFError("Removing activity failed:"+activityUIID,"removeActivity",this,null);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -rff2e6cf53af41f7a9ab89b48f5c7377db2c30f63 -rf529b671aab92c3a3ac9d7aff0a435a71060ff61
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision ff2e6cf53af41f7a9ab89b48f5c7377db2c30f63)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision f529b671aab92c3a3ac9d7aff0a435a71060ff61)
@@ -496,6 +496,11 @@
 			
 			Debugger.log("defineLater: " + ba.defineLater, Debugger.CRITICAL, "showBranchingActivityProperties", "PropertyInspector");
 			//_define_monitor_cb.selected = (ba.defineLater != null) ? ba.defineLater : false;
+		} else if(_canvasModel.selectedItem.activity.activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE) {
+			if(toolActs_cmb.selectedIndex == 0) {
+				_canvasModel.selectedItem.activity.toolActivityUIID = null;
+				branchToolInputChange(_canvasModel.selectedItem, toolActs_cmb.dataProvider[0].data);
+			}
 		}
 	
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r7c8ff663c07662a984677b2ed751754346226590 -rf529b671aab92c3a3ac9d7aff0a435a71060ff61
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision f529b671aab92c3a3ac9d7aff0a435a71060ff61)
@@ -411,6 +411,7 @@
 			showAppliedGroupingControls(v, e);
 		} else if(_activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE) {
 			showToolBasedBranchingControls(v, e);
+			
 			if(toolActs_cmb.visible) {
 				toolActs_cmb.dataProvider = _canvasModel.getDownstreamToolActivities();
 				
@@ -420,6 +421,11 @@
 					for(var i=0; i < dp.length; i++)
 						if(dp[i].data == _canvasModel.selectedItem.activity.toolActivityUIID)
 							toolActs_cmb.selectedIndex = i;
+							
+					if(toolActs_cmb.selectedIndex == 0) {
+						_canvasModel.selectedItem.activity.toolActivityUIID = null;
+						branchToolInputChange(_canvasModel.selectedItem, toolActs_cmb.dataProvider[0].data);
+					}
 				}
 			}
 			
@@ -900,7 +906,6 @@
 				toolActs_cmb.dataProvider = _canvasModel.getDownstreamToolActivities();
 				for(var i=0; i < toolActs_cmb.dataProvider.length; i++)
 					selectToolActivityItem(i, toolActs_cmb.dataProvider[i].data);
-						
 			}
 				
 			
@@ -1017,10 +1022,13 @@
 		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID);
 		
 		if(branches.myBranches.length > 0) {
-			_tool_output_match_btn.visible = v;
-			
-			if(_canvasModel.selectedItem.activity.toolActivityUIID != null)
+			if(_canvasModel.selectedItem.activity.toolActivityUIID != null) {
+				_tool_output_match_btn.visible = v;
 				_conditions_setup_btn.visible = v;
+			} else {
+				_tool_output_match_btn.visible = false;
+				_conditions_setup_btn.visible = false;
+			}
 		}
 		
 		if(e != null) {