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.75 -r1.76
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	1 Nov 2006 22:39:23 -0000	1.75
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	2 Nov 2006 20:49:10 -0000	1.76
@@ -71,8 +71,8 @@
 	public static final String ERROR_LIST_LEARNER						="errorListLearner";
 	public static final String MAP_SEQUENTIAL_ANSWERS_KEY				="mapSequentialAnswersKey";
 	public static final String DEFAULT_CONTENT_ID_STR					="defaultContentIdStr";
-	public static final String DEFAULT_ONLINE_INST						="online instructions";
-	public static final String DEFAULT_OFFLINE_INST						="offline instructions";
+	public static final String DEFAULT_ONLINE_INST						="";
+	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";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v
diff -u -r1.53 -r1.54
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	20 Sep 2006 15:15:44 -0000	1.53
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	2 Nov 2006 20:49:10 -0000	1.54
@@ -138,14 +138,6 @@
 		qaAuthoringForm.setOnlineInstructions(onlineInstructions);
 		qaGeneralAuthoringDTO.setOnlineInstructions(onlineInstructions);
 
-		/*
-		String defineLaterInEditMode=request.getParameter(DEFINE_LATER_IN_EDIT_MODE);
-		logger.debug("defineLaterInEditMode: " + defineLaterInEditMode);
-		qaAuthoringForm.setDefineLaterInEditMode(defineLaterInEditMode);
-		qaGeneralAuthoringDTO.setDefineLaterInEditMode(defineLaterInEditMode);
-		*/
-		
-
 		String reflect=request.getParameter(REFLECT);
 		logger.debug("reflect: " + reflect);
 		qaAuthoringForm.setReflect(reflect);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v
diff -u -r1.21 -r1.22
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	11 Oct 2006 07:20:02 -0000	1.21
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	2 Nov 2006 20:49:10 -0000	1.22
@@ -1044,14 +1044,6 @@
 		
 		QaContent qaContent=qaService.loadQa(new Long(strToolContentID).longValue());
 		logger.debug("qaContent: " + qaContent);
-		/*
-		if (qaContent == null)
-		{
-			logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
-			qaContent=qaService.loadQa(new Long(defaultContentIdStr).longValue());
-		}
-		logger.debug("final qaContent: " + qaContent);
-		*/
 		
 
 		QaGeneralAuthoringDTO qaGeneralAuthoringDTO= new QaGeneralAuthoringDTO();
@@ -1346,14 +1338,6 @@
 		QaContent qaContent=qaService.loadQa(new Long(strToolContentID).longValue());
 		logger.debug("qaContent: " + qaContent);
 
-		/*
-		if (qaContent == null)
-		{
-			logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
-			qaContent=qaService.loadQa(new Long(defaultContentIdStr).longValue());
-		}
-		logger.debug("final qaContent: " + qaContent);
-		*/
 	
 		QaGeneralAuthoringDTO qaGeneralAuthoringDTO= new QaGeneralAuthoringDTO();
 		logger.debug("qaGeneralAuthoringDTO: " + qaGeneralAuthoringDTO);
@@ -1495,14 +1479,6 @@
 		QaContent qaContent=qaService.loadQa(new Long(strToolContentID).longValue());
 		logger.debug("qaContent: " + qaContent);
 		
-		/*
-		if (qaContent == null)
-		{
-			logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
-			qaContent=qaService.loadQa(new Long(defaultContentIdStr).longValue());
-		}
-		logger.debug("final qaContent: " + qaContent);
-		*/
 	
 		QaGeneralAuthoringDTO qaGeneralAuthoringDTO= new QaGeneralAuthoringDTO();
 		logger.debug("qaGeneralAuthoringDTO: " + qaGeneralAuthoringDTO);
@@ -1634,15 +1610,6 @@
 		
 		QaContent qaContent=qaService.loadQa(new Long(strToolContentID).longValue());
 		logger.debug("qaContent: " + qaContent);
-
-		/*
-		if (qaContent == null)
-		{
-			logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
-			qaContent=qaService.loadQa(new Long(defaultContentIdStr).longValue());
-		}
-		logger.debug("final qaContent: " + qaContent);
-		*/
 		
 		
 		QaGeneralAuthoringDTO qaGeneralAuthoringDTO= new QaGeneralAuthoringDTO();
@@ -1774,14 +1741,6 @@
 		
 		QaContent qaContent=qaService.loadQa(new Long(strToolContentID).longValue());
 		logger.debug("qaContent: " + qaContent);
-		/*
-		if (qaContent == null)
-		{
-			logger.debug("using defaultContentIdStr: " + defaultContentIdStr);
-			qaContent=qaService.loadQa(new Long(defaultContentIdStr).longValue());
-		}
-		logger.debug("final qaContent: " + qaContent);
-		*/
 		
 
 		QaGeneralAuthoringDTO qaGeneralAuthoringDTO= new QaGeneralAuthoringDTO(); 
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/QaDataAccessTestCase.java,v
diff -u -r1.18 -r1.19
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java	20 Sep 2006 15:15:44 -0000	1.18
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaDataAccessTestCase.java	2 Nov 2006 20:49:08 -0000	1.19
@@ -135,16 +135,16 @@
     {
     	QaContent qa = new QaContent();
     	qa.setQaContentId(new Long(TEST_NEW_CONTENT_ID+1));
-    	qa.setTitle("New - Put Title Here");
-    	qa.setInstructions("New - Put instructions here.");
+    	qa.setTitle("New Title");
+    	qa.setInstructions("New Instructions");
     	qa.setCreationDate(new Date(System.currentTimeMillis()));
     	qa.setCreatedBy(0);
         qa.setUsernameVisible(false);
         qa.setDefineLater(false);
         qa.setSynchInMonitor(false);
-        qa.setOnlineInstructions("New- online instructions");
-        qa.setOfflineInstructions("New- offline instructions");
-        qa.setReportTitle("New-Report title");
+        qa.setOnlineInstructions("");
+        qa.setOfflineInstructions("");
+        qa.setReportTitle("");
         qa.setQaQueContents(new TreeSet());
         qa.setQaSessions(new TreeSet());
         
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/TestQaContent.java,v
diff -u -r1.20 -r1.21
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java	20 Sep 2006 15:15:44 -0000	1.20
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/TestQaContent.java	2 Nov 2006 20:49:08 -0000	1.21
@@ -57,38 +57,6 @@
         super(name);
     }
     
-/*    
-    public void testSimpleCreateNewQaContent()
-    {
-    	//create new qa content
-    	QaContent qa = new QaContent();
-		qa.setQaContentId(new Long(TEST_NEW_CONTENT_ID));
-		qa.setTitle("New - Put Title Here");
-		qa.setInstructions("New - Put instructions here.");
-		qa.setCreationDate(new Date(System.currentTimeMillis()).toString() );
-		qa.setCreatedBy(0);
-	    qa.setUsernameVisible(false);
-	    qa.setDefineLater(false);
-	    qa.setSynchInMonitor(false);
-	    qa.setOnlineInstructions("New- online instructions");
-	    qa.setOfflineInstructions("New- offline instructions");
-	    qa.setReportTitle("New-Report title");
-	    qa.setQaQueContents(new TreeSet());
-	    qa.setQaSessions(new TreeSet());
-	    
-	    //create new qa que content
-	    QaQueContent qaQueContent = new QaQueContent("What planet are you from",
-	    											4, 
-													qa, 
-													new TreeSet(), 
-													new TreeSet());
-	    
-	    qa.getQaQueContents().add(qaQueContent);
-	    
-	    //create the new content
-	    qaContentDAO.createQa(qa);
-    }
-  */  
     
    /* 
     public void testCreateNewQaContent()