Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v
diff -u -r1.97 -r1.98
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	13 Nov 2006 00:31:22 -0000	1.97
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	16 Nov 2006 01:17:05 -0000	1.98
@@ -69,8 +69,6 @@
 	public static final String ONLINE_INSTRUCTIONS_KEY					= "onlineInstructionsKey";
 	public static final String OFFLINE_INSTRUCTIONS_KEY					= "offlineInstructionsKey";
 	public static final String MAP_QUESTION_CONTENT_KEY					= "mapQuestionContentKey";
-	public static final String DEFAULT_MC_TITLE							="MCQ";
-	public static final String DEFAULT_MC_INSTRUCTIONS					="Instructions";
 	public static final String LOAD_VIEW_ONLY							="loadViewOnly";
 	public static final String MC_GENERAL_AUTHORING_DTO					="mcGeneralAuthoringDTO";
 	public static final String DEFAULT_CONTENT_ID_STR					="defaultContentIdStr";
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.33 -r1.34
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	13 Nov 2006 00:31:22 -0000	1.33
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	16 Nov 2006 01:17:05 -0000	1.34
@@ -4675,26 +4675,9 @@
 		logger.debug("starting prepareEditActivityScreenData: " + mcContent);
 	    McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
 		
-	    if (mcContent.getTitle() == null)
-		{
-			mcGeneralAuthoringDTO.setActivityTitle(DEFAULT_MC_TITLE);
-		}
-		else
-		{
-			mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle());
-		}
-
+		mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle());
+		mcGeneralAuthoringDTO.setActivityInstructions(mcContent.getInstructions());
 		
-		if (mcContent.getInstructions() == null)
-		{
-		    mcGeneralAuthoringDTO.setActivityInstructions(DEFAULT_MC_INSTRUCTIONS);
-		}
-		else
-		{
-			mcGeneralAuthoringDTO.setActivityInstructions(mcContent.getInstructions());
-		}
-		
-		
 		logger.debug("final mcGeneralAuthoringDTO: " + mcGeneralAuthoringDTO);
 		request.setAttribute(MC_GENERAL_AUTHORING_DTO, mcGeneralAuthoringDTO);
 	}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v
diff -u -r1.89 -r1.90
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	14 Nov 2006 20:11:26 -0000	1.89
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	16 Nov 2006 01:17:05 -0000	1.90
@@ -469,29 +469,12 @@
 
 	    mcGeneralAuthoringDTO.setIsDefineLater(new Boolean(mcContent.isDefineLater()).toString());
 	    
-		if (mcContent.getTitle() == null)
-		{
-			mcGeneralAuthoringDTO.setActivityTitle(DEFAULT_MC_TITLE);
-			mcAuthoringForm.setTitle(DEFAULT_MC_TITLE);
-		}
-		else
-		{
-			mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle());
-			mcAuthoringForm.setTitle(mcContent.getTitle());
-		}
+		mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle());
+		mcAuthoringForm.setTitle(mcContent.getTitle());
 
+		mcGeneralAuthoringDTO.setActivityInstructions( mcContent.getInstructions());
+		mcAuthoringForm.setInstructions(mcContent.getInstructions());
 		
-		if (mcContent.getInstructions() == null)
-		{
-		    mcGeneralAuthoringDTO.setActivityInstructions(DEFAULT_MC_INSTRUCTIONS);
-		    mcAuthoringForm.setInstructions(DEFAULT_MC_INSTRUCTIONS);
-		}
-		else
-		{
-			mcGeneralAuthoringDTO.setActivityInstructions( mcContent.getInstructions());
-			mcAuthoringForm.setInstructions(mcContent.getInstructions());
-		}
-		
 		sessionMap.put(ACTIVITY_TITLE_KEY, mcGeneralAuthoringDTO.getActivityTitle());
 	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, mcGeneralAuthoringDTO.getActivityInstructions());
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.77 -r1.78
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	11 Nov 2006 15:00:54 -0000	1.77
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	16 Nov 2006 01:17:47 -0000	1.78
@@ -75,8 +75,6 @@
 	public static final String DEFAULT_OFFLINE_INST						="";
 	public static final String TOOL_SESSION_ID 							= "toolSessionID";
 	public static final String EXPORT_USER_ID							="exportUserId";
-	public static final String DEFAULT_QA_TITLE							="Q&A";
-	public static final String DEFAULT_QA_INSTRUCTIONS					="Instructions";
 	public static final String NOTEBOOK									="notebook";
 	public static final String ENTRY_TEXT								="entryText";
 	public static final String REFLECTIONS_CONTAINER_DTO				="reflectionsContainerDTO";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v
diff -u -r1.54 -r1.55
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	15 Nov 2006 00:38:12 -0000	1.54
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	16 Nov 2006 01:17:47 -0000	1.55
@@ -2477,25 +2477,8 @@
 		logger.debug("starting prepareEditActivityScreenData: " + qaContent);
 	    QaGeneralAuthoringDTO qaGeneralAuthoringDTO= new QaGeneralAuthoringDTO();
 		
-	    if (qaContent.getTitle() == null)
-		{
-			qaGeneralAuthoringDTO.setActivityTitle(DEFAULT_QA_TITLE);
-		}
-		else
-		{
-			qaGeneralAuthoringDTO.setActivityTitle(qaContent.getTitle());
-		}
-
-		
-		if (qaContent.getInstructions() == null)
-		{
-		    qaGeneralAuthoringDTO.setActivityInstructions(DEFAULT_QA_INSTRUCTIONS);
-		}
-		else
-		{
-			qaGeneralAuthoringDTO.setActivityInstructions(qaContent.getInstructions());
-		}
-		
+		qaGeneralAuthoringDTO.setActivityTitle(qaContent.getTitle());
+		qaGeneralAuthoringDTO.setActivityInstructions(qaContent.getInstructions());
 	
 		logger.debug("final qaGeneralAuthoringDTO: " + qaGeneralAuthoringDTO);
 		request.setAttribute(QA_GENERAL_AUTHORING_DTO, qaGeneralAuthoringDTO);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v
diff -u -r1.61 -r1.62
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	13 Nov 2006 19:38:46 -0000	1.61
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	16 Nov 2006 01:17:47 -0000	1.62
@@ -441,29 +441,12 @@
 
 	    qaGeneralAuthoringDTO.setIsDefineLater(new Boolean(qaContent.isDefineLater()).toString());
 	    
-		if (qaContent.getTitle() == null)
-		{
-			qaGeneralAuthoringDTO.setActivityTitle(DEFAULT_QA_TITLE);
-			qaAuthoringForm.setTitle(DEFAULT_QA_TITLE);
-		}
-		else
-		{
-			qaGeneralAuthoringDTO.setActivityTitle(qaContent.getTitle());
-			qaAuthoringForm.setTitle(qaContent.getTitle());
-		}
+		qaGeneralAuthoringDTO.setActivityTitle(qaContent.getTitle());
+		qaAuthoringForm.setTitle(qaContent.getTitle());
 
+		qaGeneralAuthoringDTO.setActivityInstructions( qaContent.getInstructions());
+		qaAuthoringForm.setInstructions(qaContent.getInstructions());
 		
-		if (qaContent.getInstructions() == null)
-		{
-		    qaGeneralAuthoringDTO.setActivityInstructions(DEFAULT_QA_INSTRUCTIONS);
-		    qaAuthoringForm.setInstructions(DEFAULT_QA_INSTRUCTIONS);
-		}
-		else
-		{
-			qaGeneralAuthoringDTO.setActivityInstructions( qaContent.getInstructions());
-			qaAuthoringForm.setInstructions(qaContent.getInstructions());
-		}
-		
 		sessionMap.put(ACTIVITY_TITLE_KEY, qaGeneralAuthoringDTO.getActivityTitle());
 	    sessionMap.put(ACTIVITY_INSTRUCTIONS_KEY, qaGeneralAuthoringDTO.getActivityInstructions());