Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r4f86eb076cd60f65046d56234985443e639c5089 -r7c8ff663c07662a984677b2ed751754346226590
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 4f86eb076cd60f65046d56234985443e639c5089)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
@@ -23,6 +23,7 @@
 
 import org.lamsfoundation.lams.authoring.*;
 import org.lamsfoundation.lams.common.util.*;
+import org.lamsfoundation.lams.common.ui.Cursor;
 import org.lamsfoundation.lams.authoring.br.BranchConnector;
 import org.lamsfoundation.lams.common.*;
 import mx.events.*
@@ -764,7 +765,8 @@
 				if((classMappingEntries[i].branchingActivity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE 
 						&& classMappingEntries[i].group != null) ||
 					(classMappingEntries[i].branchingActivity.activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE 
-						&& classMappingEntries[i].condition != null)) {
+						&& classMappingEntries[i].condition != null 
+						&& classMappingEntries[i].condition.toolActivity.activityUIID == classMappingEntries[i].branchingActivity.toolActivityUIID)) {
 					design.branchMappings.push(classMappingEntries[i].toData());
 				}
 			}
@@ -873,6 +875,18 @@
 		return gActs;
 	}
 	
+	public function getActivitiesByType(type:Number):Array{
+		var acts:Array = _activities.values();
+		var tActs = new Array();
+		for(var i=0; i<acts.length;i++){
+			if(acts[i].activityTypeID == type){
+				tActs.push(acts[i]);
+			}
+		}
+		
+		return tActs;
+	}
+	
 	public function getGroupByUIID(groupUIID:Number):Group {
 		var groupings:Array = _groupings.values();
 		
@@ -1052,7 +1066,93 @@
 	public function getAllConditions():Array {
 		return _outputConditions.values();
 	}
+	public function getAllConditionsForToolOutput(toolActivityUIID:Number):Array {
+		var conditions:Array = getAllConditions();
+		var rConditions:Array = new Array();
+		
+		for(var i=0; i<conditions.length; i++) {
+			if(conditions[i].toolActivity.activityUIID = toolActivityUIID)
+				rConditions.push(conditions[i]);
+		}
+		
+		return rConditions;
+	}
 	
+	/**
+	 * Search through all Branching Activities and check if any unused or redundant mappings exist in the DDM
+	 * @param remove  remove all instances if true
+	 */
+	public function hasRedundantBranchMappings(remove:Boolean):Boolean {
+		var i;
+		var v:Boolean = true;
+		
+		var gActs:Array = getActivitiesByType(Activity.GROUP_BRANCHING_ACTIVITY_TYPE);
+		var tActs:Array = getActivitiesByType(Activity.TOOL_BRANCHING_ACTIVITY_TYPE);
+		var cActs:Array = getActivitiesByType(Activity.CHOSEN_BRANCHING_ACTIVITY_TYPE);
+		
+		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;
+					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;
+					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;
+			}
+			
+			for(var j=0; j<mappings.toolBased.length; j++) {
+				mappingsToRemove.concat(mappings.toolBased[j]);
+				v = false;
+			}
+		}
+		
+		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);
+			}
+		}
+		
+		return !v;
+		
+	}
+	
+	public function removeRedundantBranchMappings(returnToSave:Function):Void {
+		Cursor.showCursor(ApplicationParent.C_HOURGLASS);
+		hasRedundantBranchMappings(true);
+		returnToSave();
+	}
+	
 	//Getters and setters for the properties
 	public function get objectType():String{
 		return _objectType;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as
===================================================================
diff -u -r4f86eb076cd60f65046d56234985443e639c5089 -r7c8ff663c07662a984677b2ed751754346226590
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	(.../ToolOutputCondition.as)	(revision 4f86eb076cd60f65046d56234985443e639c5089)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	(.../ToolOutputCondition.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
@@ -89,6 +89,8 @@
 				condition.startValue = startValue;
 				condition.endValue = endValue;
 			}
+			
+			condition.toolActivity = toolActivity;
 		}
 		
 		return condition;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as
===================================================================
diff -u -r9aab591f71aa913ad9b848d8cd406728c171470b -r7c8ff663c07662a984677b2ed751754346226590
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as	(.../ConditionMatchingDialog.as)	(revision 9aab591f71aa913ad9b848d8cd406728c171470b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as	(.../ConditionMatchingDialog.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
@@ -124,8 +124,10 @@
 		Debugger.log("Loading Lists: mappings length: " + mappings.length, Debugger.CRITICAL, "loadLists", "ConditionMatchingDialog");
 		
 		for(var i=0; i < mappings.length; i++) {
-			match_dgd.addItem(mappings[i]);
-			removeCondition(mappings[i].condition);
+			if(mappings[i].condition.toolActivity.activityUIID == _branchingActivity.toolActivityUIID) {
+				match_dgd.addItem(mappings[i]);
+				removeCondition(mappings[i].condition);
+			}
 		}
 		
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r4f86eb076cd60f65046d56234985443e639c5089 -r7c8ff663c07662a984677b2ed751754346226590
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 4f86eb076cd60f65046d56234985443e639c5089)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
@@ -245,12 +245,12 @@
 		var branches:Array = app.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(_branchingActivity.activityUIID).toolBased;
 		
 		for(var i=0; i<branches.length; i++) {
-			if(i==0) setDefinition(branches[i].condition.name);
-			addCondition(branches[i].condition);
-			//itemChanged(null);
+			if(branches[i].condition.toolActivity.activityUIID == _toolActivity.activityUIID) {
+				addCondition(branches[i].condition);
+				if(_condition_item_dgd.length==1) setDefinition(branches[i].condition.name);
+			}
 		}
-		
-		//if(branches.length <= 0) 
+
 		itemChanged(null);
 		
 		this._visible = true;
@@ -266,8 +266,8 @@
 	
 	private function addButton_onPress():Void {
 		if(validateCondition(_selectedDefinition))
-			if(Boolean(_opt_greaterThan_cb.value)) addCondition(ToolOutputCondition.createLongCondition(app.getCanvas().ddm.newUIID(), "unnamed", _selectedDefinition, _toolActivity, _start_value_stp.value, null));
-			else addCondition(ToolOutputCondition.createLongCondition(app.getCanvas().ddm.newUIID(), "unnamed", _selectedDefinition, _toolActivity, _start_value_stp.value, _end_value_stp.value));
+			if(Boolean(_opt_greaterThan_cb.value)) addCondition(ToolOutputCondition.createLongCondition(app.getCanvas().ddm.newUIID(), Dictionary.getValue("to_condition_untitled_item_lbl", [Number(_condition_item_dgd.length+1)]), _selectedDefinition, _toolActivity, _start_value_stp.value, null));
+			else addCondition(ToolOutputCondition.createLongCondition(app.getCanvas().ddm.newUIID(), Dictionary.getValue("to_condition_untitled_item_lbl", [Number(_condition_item_dgd.length+1)]), _selectedDefinition, _toolActivity, _start_value_stp.value, _end_value_stp.value));
 	}
 	
 	private function clearAllButton_onPress(evt:Object, c:Boolean):Void {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r77eee398c52fbbce73bd7df19e8f5b1d5ad651fe -r7c8ff663c07662a984677b2ed751754346226590
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 77eee398c52fbbce73bd7df19e8f5b1d5ad651fe)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
@@ -197,19 +197,23 @@
 			_ddm.licenseText = workspaceResultDTO.resourceLicenseText;
 			_ddm.licenseID = workspaceResultDTO.resourceLicenseID;
 		}
-		var mode:String = Application.getInstance().getWorkspace().getWorkspaceModel().currentMode;
 		
+		var mode:String = Application.getInstance().getWorkspace().getWorkspaceModel().currentMode;
 		_ddm.saveMode = (mode == Workspace.MODE_SAVEAS) ? 1 : 0;
 		
 		Debugger.log('SAVE MODE:'+_ddm.saveMode,Debugger.CRITICAL,'saveDesignToServer','Canvas');
 		
+		if(_ddm.hasRedundantBranchMappings(false)) {
+			Cursor.showCursor(Application.C_DEFAULT);
+			LFMessage.showMessageConfirm(Dictionary.getValue("redundant_branch_mappings_msg"), Proxy.create(_ddm, _ddm.removeRedundantBranchMappings, Proxy.create(this, saveDesignToServer, workspaceResultDTO)), null, Dictionary.getValue("al_continue"), null);
+		} else {
 		
-		var dto:Object = _ddm.getDesignForSaving();
+			var dto:Object = _ddm.getDesignForSaving();
+			var callback:Function = Proxy.create(this,onStoreDesignResponse);
+			
+			Application.getInstance().getComms().sendAndReceive(dto,"servlet/authoring/storeLearningDesignDetails",callback,false);
+		}	
 		
-		var callback:Function = Proxy.create(this,onStoreDesignResponse);
-		
-		Application.getInstance().getComms().sendAndReceive(dto,"servlet/authoring/storeLearningDesignDetails",callback,false);
-		
 		return true;
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r4f86eb076cd60f65046d56234985443e639c5089 -r7c8ff663c07662a984677b2ed751754346226590
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 4f86eb076cd60f65046d56234985443e639c5089)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
@@ -681,12 +681,12 @@
 		if(!_canvasController.isBusy() && evt.type == 'focusOut') {
 			var g:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.createGroupingUIID);
 		
-			if(_canvasModel.getCanvas().ddm.hasBranchMappingsForGroupingUIID(g.groupingUIID)) {
-				_canvasController.setBusy();
-				LFMessage.showMessageConfirm("Warning: Existing Group-to-Branch mappings may be effected by your change. Do you wish to continue?", Proxy.create(this, doUpdateGroupingMethodData, g), Proxy.create(this, retainOldGroupingMethodData), "Yes", "No",  "Warning");
-			} else {
+			//if(_canvasModel.getCanvas().ddm.hasBranchMappingsForGroupingUIID(g.groupingUIID)) {
+			//	_canvasController.setBusy();
+			//	LFMessage.showMessageConfirm("Warning: Existing Group-to-Branch mappings may be effected by your change. Do you wish to continue?", Proxy.create(this, doUpdateGroupingMethodData, g), Proxy.create(this, retainOldGroupingMethodData), "Yes", "No",  "Warning");
+			//} else {
 				doUpdateGroupingMethodData(g);
-			}
+			//}
 		}
 	}
 	
@@ -898,7 +898,7 @@
 		
 			if(toolActs_cmb.visible) {
 				toolActs_cmb.dataProvider = _canvasModel.getDownstreamToolActivities();
-				for(var i in toolActs_cmb.dataProvider)
+				for(var i=0; i < toolActs_cmb.dataProvider.length; i++)
 					selectToolActivityItem(i, toolActs_cmb.dataProvider[i].data);
 						
 			}
@@ -927,9 +927,11 @@
 		for(var i=0; i < mappings.length; i++) {
 			if(mappings[i].condition.toolActivity.activityUIID == UIID) {
 				toolActs_cmb.selectedIndex = index;
-				dispatchEvent({type: "click", target:toolActs_cmb});
+				branchToolInputChange(_canvasModel.selectedItem, toolActs_cmb.dataProvider[index].data);
 			}
 		}
+		
+		
 	}
 	
 	/**
@@ -943,11 +945,7 @@
 		
 		Debugger.log('groupingUIID: '+g.groupingUIID,Debugger.GEN,'onGroupTypeChange','PropertyInspector');
 		
-		if(_canvasModel.getCanvas().ddm.hasBranchMappingsForGroupingUIID(g.groupingUIID))
-			LFMessage.showMessageConfirm("Warning: Existing Group-to-Branch mappings may be effected by your change. Do you wish to continue?", Proxy.create(this, updateGroupingType, g, evt.target.value), Proxy.create(this, populateGroupingProperties, _canvasModel.selectedItem.activity), "Yes", "No",  "Warning");
-		else	
-			updateGroupingType(g, evt.target.value);
-		
+		updateGroupingType(g, evt.target.value);
 		
 	}
 	
@@ -994,12 +992,19 @@
 	private function onBranchToolInputChange(evt:Object) {
 		Debugger.log('branch input change: ' + evt.target.value, Debugger.CRITICAL, "onBranchToolInputChange", "PIC*");
 		
-		_canvasModel.selectedItem.activity.toolActivityUIID = (evt.target.value != 0) ? evt.target.value : null;
-		_canvasModel.selectedItem.refresh();
+		branchToolInputChange(_canvasModel.selectedItem, evt.target.value);
+	}
+	
+	private function branchToolInputChange(ca, toolActivityUIID) {
+		var mappings:Array = _canvasModel.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(ca.activity.activityUIID).toolBased;
 		
-		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID);
-		_conditions_setup_btn.visible = ((_canvasModel.selectedItem.activity.toolActivityUIID != null) && (branches.myBranches.length > 0)) ? true : false;
-		
+		ca.activity.toolActivityUIID = (toolActivityUIID != 0) ? toolActivityUIID : null;
+		ca.refresh();
+			
+		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID);
+		_conditions_setup_btn.visible = ((ca.activity.toolActivityUIID != null) && (branches.myBranches.length > 0)) ? true : false;
+		_tool_output_match_btn.visible = ((ca.activity.toolActivityUIID != null) && (branches.myBranches.length > 0)) ? true : false;
+			
 		setModified();
 	}
 	
@@ -1149,7 +1154,7 @@
 	
 	private function ConditionMatchDialogLoaded(evt:Object) {
 		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID);
-		var conditions:Array = _canvasModel.getCanvas().ddm.getAllConditions();
+		var conditions:Array = _canvasModel.getCanvas().ddm.getAllConditionsForToolOutput(BranchingActivity(_canvasModel.selectedItem.activity).toolActivityUIID);
 		
 		evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity);
 		evt.target.scrollContent.conditions = conditions;