Index: lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8b5473449dff565aa7166137883b3edf46f8b3ee
--- lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml	(.../CommonCartridge.hbm.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml	(.../CommonCartridge.hbm.xml)	(revision 8b5473449dff565aa7166137883b3edf46f8b3ee)
@@ -61,14 +61,6 @@
         />
 
         <property
-            name="lockWhenFinished"
-            type="boolean"
-            update="true"
-            insert="true"
-            column="lock_on_finished"
-        />
-
-        <property
             name="instructions"
             type="text"
             update="true"
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8b5473449dff565aa7166137883b3edf46f8b3ee
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java	(.../CommonCartridgeConstants.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java	(.../CommonCartridgeConstants.java)	(revision 8b5473449dff565aa7166137883b3edf46f8b3ee)
@@ -86,10 +86,6 @@
 
     public static final String ATTR_RESOURCE_INSTRUCTION = "instructions";
 
-    public static final String ATTR_FINISH_LOCK = "finishedLock";
-
-    public static final String ATTR_LOCK_ON_FINISH = "lockOnFinish";
-
     public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
 
     public static final String ATTR_RESOURCE_FORM = "commonCartridgeForm";
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20181012.sql
===================================================================
diff -u
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20181012.sql	(revision 0)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20181012.sql	(revision 8b5473449dff565aa7166137883b3edf46f8b3ee)
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4671 Remove "locked when finished" option
+ALTER TABLE tl_laimsc11_commoncartridge DROP COLUMN lock_on_finished;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8b5473449dff565aa7166137883b3edf46f8b3ee
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java	(.../CommonCartridge.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java	(.../CommonCartridge.java)	(revision 8b5473449dff565aa7166137883b3edf46f8b3ee)
@@ -57,8 +57,6 @@
 
     private int miniViewCommonCartridgeNumber;
 
-    private boolean lockWhenFinished;
-
     private boolean defineLater;
 
     private boolean contentInUse;
@@ -260,24 +258,6 @@
     }
 
     /**
-     * @return Returns the lockWhenFinish.
-     *
-     *
-     *
-     */
-    public boolean getLockWhenFinished() {
-	return lockWhenFinished;
-    }
-
-    /**
-     * @param lockWhenFinished
-     *            Set to true to lock the commonCartridge for finished users.
-     */
-    public void setLockWhenFinished(boolean lockWhenFinished) {
-	this.lockWhenFinished = lockWhenFinished;
-    }
-
-    /**
      * @return Returns the instructions set by the teacher.
      *
      *
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r8b5473449dff565aa7166137883b3edf46f8b3ee
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java	(.../LearningController.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java	(.../LearningController.java)	(revision 8b5473449dff565aa7166137883b3edf46f8b3ee)
@@ -123,10 +123,6 @@
 	List<CommonCartridgeItem> items = new ArrayList<>();
 	items.addAll(commonCartridge.getCommonCartridgeItems());
 
-	// check whehter finish lock is on/off
-	boolean lock = commonCartridge.getLockWhenFinished() && commonCartridgeUser != null
-		&& commonCartridgeUser.isSessionFinished();
-
 	// check whether there is only one commonCartridge item and run auto flag is true or not.
 	boolean runAuto = false;
 	Long runAutoItemUid = null;
@@ -158,8 +154,6 @@
 	// basic information
 	sessionMap.put(CommonCartridgeConstants.ATTR_TITLE, commonCartridge.getTitle());
 	sessionMap.put(CommonCartridgeConstants.ATTR_RESOURCE_INSTRUCTION, commonCartridge.getInstructions());
-	sessionMap.put(CommonCartridgeConstants.ATTR_FINISH_LOCK, lock);
-	sessionMap.put(CommonCartridgeConstants.ATTR_LOCK_ON_FINISH, commonCartridge.getLockWhenFinished());
 	sessionMap.put(CommonCartridgeConstants.ATTR_USER_FINISHED,
 		commonCartridgeUser != null && commonCartridgeUser.isSessionFinished());
 
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgeForm.java
===================================================================
diff -u -r1d6eef003bf303f75c5405b66a13ac86232cec03 -r8b5473449dff565aa7166137883b3edf46f8b3ee
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgeForm.java	(.../CommonCartridgeForm.java)	(revision 1d6eef003bf303f75c5405b66a13ac86232cec03)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgeForm.java	(.../CommonCartridgeForm.java)	(revision 8b5473449dff565aa7166137883b3edf46f8b3ee)
@@ -33,8 +33,6 @@
  *
  * CommonCartridge Form.
  *
- *
- *
  * User: Dapeng.Ni
  */
 public class CommonCartridgeForm {
@@ -70,7 +68,6 @@
 	// if it is start page, all data read out from database or current session
 	// so need not reset checkbox to refresh value!
 	if (!StringUtils.equals(param, "start") && !StringUtils.equals(param, "initPage")) {
-	    commonCartridge.setLockWhenFinished(false);
 	    commonCartridge.setDefineLater(false);
 	    commonCartridge.setRunAuto(false);
 	    commonCartridge.setReflectOnActivity(false);
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r8b5473449dff565aa7166137883b3edf46f8b3ee
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java	(.../CompleteItemServlet.java)	(revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/servlet/CompleteItemServlet.java	(.../CompleteItemServlet.java)	(revision 8b5473449dff565aa7166137883b3edf46f8b3ee)
@@ -39,6 +39,7 @@
 import org.lamsfoundation.lams.tool.commonCartridge.service.ICommonCartridgeService;
 import org.lamsfoundation.lams.tool.commonCartridge.util.CommonCartridgeItemComparator;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -65,29 +66,16 @@
 	SpringBeanAutowiringSupport.processInjectionBasedOnServletContext(this, config.getServletContext());
     }
 
-    /**
-     * The doGet method of the servlet. <br>
-     *
-     *
-     * @param request
-     *            the request send by the client to the server
-     * @param response
-     *            the response send by the server to the client
-     * @throws ServletException
-     *             if an error occurred
-     * @throws IOException
-     *             if an error occurred
-     */
     @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 	String sessionMapID = request.getParameter(CommonCartridgeConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	SessionMap<String, Object> sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 
-	Long commonCartridgeItemUid = new Long(request.getParameter(CommonCartridgeConstants.PARAM_RESOURCE_ITEM_UID));
+	Long commonCartridgeItemUid = WebUtil.readLongParam(request, CommonCartridgeConstants.PARAM_RESOURCE_ITEM_UID,
+		false);
 
-	HttpSession ss = SessionManager.getSession();
-
 	// get back login user DTO
+	HttpSession ss = SessionManager.getSession();
 	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 
 	Long sessionId = (Long) sessionMap.get(CommonCartridgeConstants.ATTR_TOOL_SESSION_ID);
@@ -102,21 +90,11 @@
 	    }
 	}
 
-	CommonCartridgeUser rUser = commonCartridgeService.getUserByIDAndSession(new Long(user.getUserID()), sessionId);
-
 	response.setContentType("text/javascript");
 	PrintWriter out = response.getWriter();
-
-	if (!rUser.isSessionFinished()) {
-	    out.println("window.parent.opener.checkNew(false);");
-	    out.println("window.parent.opener=null;");
-	    out.println("window.parent.close();");
-	} else {
-	    out.println("window.parent.opener.checkNew(true);");
-	    out.println("window.parent.opener=null;");
-	    out.println("window.parent.close();");
-	}
-
+	out.println("window.parent.opener.checkNew();");
+	out.println("window.parent.opener=null;");
+	out.println("window.parent.close();");
 	out.println();
 	out.flush();
 	out.close();
Index: lams_tool_imscc/web/pages/authoring/advance.jsp
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r8b5473449dff565aa7166137883b3edf46f8b3ee
--- lams_tool_imscc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_imscc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 8b5473449dff565aa7166137883b3edf46f8b3ee)
@@ -42,13 +42,6 @@
 <lams:SimplePanel titleKey="label.activity.completion">
 
 <div class="checkbox">
-	<label for="lock-when-finished">
-		<form:checkbox path="commonCartridge.lockWhenFinished" id="lock-when-finished"/>
-		<fmt:message key="label.authoring.advance.lock.on.finished" />
-	</label>
-</div>
-
-<div class="checkbox">
 	<label for="reflect-on-activity">
 		<form:checkbox path="commonCartridge.reflectOnActivity" id="reflect-on-activity"/>
 		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
Index: lams_tool_imscc/web/pages/learning/learning.jsp
===================================================================
diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r8b5473449dff565aa7166137883b3edf46f8b3ee
--- lams_tool_imscc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194)
+++ lams_tool_imscc/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 8b5473449dff565aa7166137883b3edf46f8b3ee)
@@ -14,10 +14,9 @@
 	<c:set var="mode" value="${sessionMap.mode}" />
 	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
 	<c:set var="commonCartridge" value="${sessionMap.commonCartridge}" />
-	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 
 	<script type="text/javascript">
-		function checkNew(checkFinishedLock) {
+		function checkNew() {
 		    var reqIDVar = new Date();
 			document.location.href = "<c:url value="/learning/start.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${toolSessionID}&reqID="+reqIDVar.getTime();
 		    return false;
@@ -46,19 +45,6 @@
 		<div class="panel">
 			<c:out value="${commonCartridge.instructions}" escapeXml="false"/>
 		</div>
-
-		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
-			<lams:Alert type="danger" id="lock-on-finish" close="false">
-				<c:choose>
-					<c:when test="${sessionMap.userFinished}">
-						<fmt:message key="message.activityLocked" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="message.warnLockOnFinish" />
-					</c:otherwise>
-				</c:choose>
-			</lams:Alert>
-		</c:if>
 		
 		<c:if test="${commonCartridge.miniViewCommonCartridgeNumber > 0}">
 			<lams:Alert type="warning" id="lock-on-finish" close="false">
Index: lams_tool_imscc/web/pages/monitoring/advanceOptions.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r8b5473449dff565aa7166137883b3edf46f8b3ee
--- lams_tool_imscc/web/pages/monitoring/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_imscc/web/pages/monitoring/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 8b5473449dff565aa7166137883b3edf46f8b3ee)
@@ -3,23 +3,6 @@
 <c:set var="adTitle"><fmt:message key="monitor.summary.th.advancedSettings" /></c:set>
 <lams:AdvancedAccordian title="${adTitle}">          
 	<table class="table table-striped table-condensed">
-	
-		<tr>
-			<td>
-				<fmt:message key="label.authoring.advance.lock.on.finished" />
-			</td>
-			
-			<td>
-				<c:choose>
-					<c:when test="${sessionMap.commonCartridge.lockWhenFinished == true}">
-						<fmt:message key="label.on" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="label.off" />
-					</c:otherwise>
-				</c:choose>	
-			</td>
-		</tr>
 		
 		<tr>
 			<td>
@@ -28,7 +11,7 @@
 			
 			<td>
 				<c:choose>
-					<c:when test="${sessionMap.commonCartridge.runAuto == true}">
+					<c:when test="${sessionMap.commonCartridge.runAuto}">
 						<fmt:message key="label.on" />
 					</c:when>
 					<c:otherwise>
@@ -55,7 +38,7 @@
 			
 			<td>
 				<c:choose>
-					<c:when test="${sessionMap.commonCartridge.reflectOnActivity == true}">
+					<c:when test="${sessionMap.commonCartridge.reflectOnActivity}">
 						<fmt:message key="label.on" />
 					</c:when>
 					<c:otherwise>
@@ -66,7 +49,7 @@
 		</tr>
 		
 		<c:choose>
-			<c:when test="${sessionMap.commonCartridge.reflectOnActivity == true}">
+			<c:when test="${sessionMap.commonCartridge.reflectOnActivity}">
 				<tr>
 					<td>
 						<fmt:message key="monitor.summary.td.notebookInstructions" />