Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r792f3d848039cb49080fbaf49d9bc2b2d461943e -r823871bf3fd2d695c40bc974a24e66b4100d731b
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 792f3d848039cb49080fbaf49d9bc2b2d461943e)
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
@@ -155,14 +155,6 @@
         length="65535"
     />
     
-    <property
-        name="endLearningMessage"
-        type="java.lang.String"
-        access="property"        
-        column="end_learning_message"
-        length="65535"
-    />
-    
 
    	 <set
             name="qaQueContents"
Index: lams_tool_laqa/db/model/lams_tool_qa.clay
===================================================================
diff -u -rfb8def0d68dd0173cbf63822e7711caed05df2e2 -r823871bf3fd2d695c40bc974a24e66b4100d731b
--- lams_tool_laqa/db/model/lams_tool_qa.clay	(.../lams_tool_qa.clay)	(revision fb8def0d68dd0173cbf63822e7711caed05df2e2)
+++ lams_tool_laqa/db/model/lams_tool_qa.clay	(.../lams_tool_qa.clay)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
@@ -95,7 +95,7 @@
 </table>
 <table alias="" name="tl_laqa11_content" remarks="">
 <table-description></table-description>
-<table-figure-bounds height="271" width="211" x="96" y="408"/>
+<table-figure-bounds height="250" width="211" x="96" y="408"/>
 <column-list>
 <column alias="" auto-increment="true" column-size="20" decimal-digits="0" default-value="" mandatory="true" name="uid" remarks="">
 <column-description></column-description>
@@ -252,13 +252,6 @@
 <variant type-name-pattern="TEXT"/>
 </data-type>
 </column>
-<column alias="" auto-increment="false" column-size="150" decimal-digits="0" default-value="Thank you!" mandatory="false" name="end_learning_message" remarks="">
-<column-description></column-description>
-<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
-<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
-</data-type>
-</column>
 <column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="0" mandatory="false" name="content_inUse" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
@@ -354,8 +347,8 @@
 <column alias="" auto-increment="false" column-size="1" decimal-digits="0" default-value="" mandatory="true" name="learnerFinished" remarks="">
 <column-description></column-description>
 <data-type jdbc-type="-6" name="TINYINT" selected-variant-pattern="TINYINT(%n)">
-<variant type-name-pattern="TINYINT"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n)"/>
+<variant type-name-pattern="TINYINT"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) UNSIGNED ZEROFILL"/>
 <variant precision-max="1" precision-min="0" precision-variable="%n" type-name-pattern="TINYINT(%n) ZEROFILL"/>
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -rfb8def0d68dd0173cbf63822e7711caed05df2e2 -r823871bf3fd2d695c40bc974a24e66b4100d731b
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision fb8def0d68dd0173cbf63822e7711caed05df2e2)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
@@ -15,7 +15,6 @@
      , synch_in_monitor TINYINT(1) NOT NULL DEFAULT 0
      , offline_instructions TEXT
      , online_instructions TEXT
-     , end_learning_message VARCHAR(150) DEFAULT 'Thank you!'
      , content_inUse TINYINT(1) DEFAULT 0
      , PRIMARY KEY (uid)
 )TYPE=InnoDB;
@@ -89,7 +88,6 @@
                   REFERENCES tl_laqa11_content (uid)
 )TYPE=InnoDB;
 
-
 -- data for content table
 INSERT INTO tl_laqa11_content (qa_content_id, title, instructions, creation_date)  VALUES (${default_content_id}, 'Q&A Title', 'Q&A Instructions', NOW());
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
===================================================================
diff -u -r792f3d848039cb49080fbaf49d9bc2b2d461943e -r823871bf3fd2d695c40bc974a24e66b4100d731b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 792f3d848039cb49080fbaf49d9bc2b2d461943e)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml	(.../QaContent.hbm.xml)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
@@ -155,14 +155,6 @@
         length="65535"
     />
     
-    <property
-        name="endLearningMessage"
-        type="java.lang.String"
-        access="property"        
-        column="end_learning_message"
-        length="65535"
-    />
-    
 
    	 <set
             name="qaQueContents"
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
diff -u -r0fb4d41712e31bd525abb02f100373875b1c7fc6 -r823871bf3fd2d695c40bc974a24e66b4100d731b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 0fb4d41712e31bd525abb02f100373875b1c7fc6)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
@@ -195,7 +195,6 @@
 		String questionsSequenced=request.getParameter(QUESTIONS_SEQUENCED);
 		String reportTitle=request.getParameter(REPORT_TITLE);
 		String monitoringReportTitle=request.getParameter(MONITORING_REPORT_TITLE);
-		String endLearningMessage=request.getParameter(END_LEARNING_MESSAGE);
 		String richTextOfflineInstructions=request.getParameter(OFFLINE_INSTRUCTIONS);
 		String richTextOnlineInstructions=request.getParameter(ONLINE_INSTRUCTIONS);
 		String activeModule=request.getParameter(ACTIVE_MODULE);
@@ -275,7 +274,6 @@
          	qaContent.setSynchInMonitor(isSynchInMonitor);
          	qaContent.setOnlineInstructions(richTextOnlineInstructions);
          	qaContent.setOfflineInstructions(richTextOfflineInstructions);
-         	qaContent.setEndLearningMessage(endLearningMessage);
          	qaContent.setReportTitle(reportTitle);
          	qaContent.setMonitoringReportTitle(monitoringReportTitle);
          	qaContent.setUsernameVisible(usernameVisibleBoolean);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
diff -u -rfb8def0d68dd0173cbf63822e7711caed05df2e2 -r823871bf3fd2d695c40bc974a24e66b4100d731b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision fb8def0d68dd0173cbf63822e7711caed05df2e2)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
@@ -298,8 +298,6 @@
 		logger.debug("REPORT_TITLE_LEARNER: " + qaContent.getReportTitle());
 		generalLearnerFlowDTO.setReportTitleLearner(qaContent.getReportTitle());
 	    
-		generalLearnerFlowDTO.setEndLearningMessage(qaContent.getEndLearningMessage());
-	    logger.debug("END_LEARNING_MESSAGE: " + qaContent.getEndLearningMessage());
 	    /*
 	     * Is the tool activity been checked as Run Offline in the property inspector?
 	     */
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -rfb8def0d68dd0173cbf63822e7711caed05df2e2 -r823871bf3fd2d695c40bc974a24e66b4100d731b
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision fb8def0d68dd0173cbf63822e7711caed05df2e2)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
@@ -265,8 +265,6 @@
 		logger.debug("REPORT_TITLE_LEARNER: " + qaContent.getReportTitle());
 		generalLearnerFlowDTO.setReportTitleLearner(qaContent.getReportTitle());
 	    
-		generalLearnerFlowDTO.setEndLearningMessage(qaContent.getEndLearningMessage());
-	    logger.debug("END_LEARNING_MESSAGE: " + qaContent.getEndLearningMessage());
 	    /*
 	     * Is the tool activity been checked as Run Offline in the property inspector?
 	     */
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
diff -u -r2c5c7c68e66e26cef44208bc922b056e3bfb1dd6 -r823871bf3fd2d695c40bc974a24e66b4100d731b
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	(.../QaResources.properties)	(revision 2c5c7c68e66e26cef44208bc922b056e3bfb1dd6)
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	(.../QaResources.properties)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
@@ -21,7 +21,6 @@
 
 label.report.title						=Report Title
 label.monitoringReport.title			=Monitoring Report Title
-label.report.endLearningMessage			=End of Activity Message
 label.question1							=Question 1
 radiobox.defineLater					=Define Later
 radiobox.synchInMonitor					=Sync in Monitor
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r2327711a9c21985a1a82c5f470c05152bba8d741 -r823871bf3fd2d695c40bc974a24e66b4100d731b
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 2327711a9c21985a1a82c5f470c05152bba8d741)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 823871bf3fd2d695c40bc974a24e66b4100d731b)
@@ -91,14 +91,6 @@
 			 		</td>
 			  	</tr>
 			  	
-			  	<tr> 
-					<td class="field-name">							
-				 		<bean:message key="label.report.endLearningMessage"/>: 
-		      		</td>
-					<td>							
-			 			<html:text property="endLearningMessage" value="${qaGeneralAuthoringDTO.endLearningMessage}" size="60" maxlength="100"/>
-			 		</td>
-			  	</tr>
 			</table>