Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -r240ff7072bdb5cdbcd92fc2e5d0eaa1fe476956c -rc471eca0f9f4b314366d1cca1189a0d40a03ab7f
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision 240ff7072bdb5cdbcd92fc2e5d0eaa1fe476956c)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision c471eca0f9f4b314366d1cca1189a0d40a03ab7f)
@@ -207,7 +207,21 @@
 		}
 	}
 	
+	/**
+	 * Removes the transitions from the DDM which are connected to the Activity 
+	 *  
+	 * @param   connectUIID connected Activity UIID
+	 */
 	
+	public function removeTransitionByConnection(connectUIID):Void{
+		var keyArray:Array = _transitions.keys();
+		for(var i=0; i<keyArray.length; i++){
+			var transition:Transition = Transition(_transitions.get(keyArray[i]));
+			if(transition.fromUIID == connectUIID || transition.toUIID == connectUIID){
+				removeTransition(transition.transitionUIID);
+			}
+		}
+	}
 	
 	/**
 	 * Adds a transition to the DDM
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r6f19b288b42a63b520acaa29346af7c07a1ae349 -rc471eca0f9f4b314366d1cca1189a0d40a03ab7f
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 6f19b288b42a63b520acaa29346af7c07a1ae349)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision c471eca0f9f4b314366d1cca1189a0d40a03ab7f)
@@ -399,8 +399,12 @@
 	 * @return  
 	 */
 	public function removeActivity(activityUIID:Number){
-		//Debugger.log('activityUIID:'+activityUIID,4,'removeActivity','Canvas');		
+		Debugger.log('activityUIID:'+activityUIID,4,'removeActivity','Canvas');		
 		_ddm.removeActivity(activityUIID);
+		
+		// remove transitions connected to this activity being removed
+		_ddm.removeTransitionByConnection(activityUIID);
+		
 		canvasModel.setDirty();		
 		//select the new thing
 		canvasModel.selectedItem = null;
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -re492ca6171c38c2f31e08f4712c561174359472b -rc471eca0f9f4b314366d1cca1189a0d40a03ab7f
Binary files differ