Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
diff -u -r509cebe97fca335b7d517abc7e8d9af03d6eab2e -r2c1a1ddb008c9257866826d3068d8ecfe0768e35
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 509cebe97fca335b7d517abc7e8d9af03d6eab2e)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
@@ -14,11 +14,6 @@
 		<id name="lessonId" type="java.lang.Long" column="lesson_id">
 			<generator class="native" />
 		</id>
-         <version
-            name="version"
-            column="version"
-            type="java.lang.Integer">
-         </version>
     	<property name="lessonDescription" type="java.lang.String" 
     			 column="description" length="65535">
 	    </property>
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170308.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170308.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170308.sql	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
@@ -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-4261 Remove optimistic locking management
+ALTER TABLE lams_lesson DROP COLUMN version;
+
+----------------------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;
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
diff -u -r509cebe97fca335b7d517abc7e8d9af03d6eab2e -r2c1a1ddb008c9257866826d3068d8ecfe0768e35
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision 509cebe97fca335b7d517abc7e8d9af03d6eab2e)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(.../Lesson.java)	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
@@ -80,9 +80,6 @@
     /** identifier field */
     private Long lessonId;
 
-    /** Hibernate managed version field */
-    private Integer version;
-
     /** persistent field */
     private String lessonName;
 
@@ -261,17 +258,6 @@
     }
 
     /**
-     * Hibernate version column - updated automatically
-     */
-    public Integer getVersion() {
-	return this.version;
-    }
-
-    public void setVersion(Integer version) {
-	this.version = version;
-    }
-
-    /**
      * @return Returns the lessonName.
      */
     public String getLessonName() {
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r2c1a1ddb008c9257866826d3068d8ecfe0768e35
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(.../ForumToolSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml	(.../ForumToolSession.hbm.xml)	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
@@ -27,12 +27,6 @@
             </generator>
         </id>
 
-        <version
-            name="version"
-            column="version"
-            type="int"
-        />
-
         <property
             name="sessionEndDate"
             type="java.util.Date"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170308.sql
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170308.sql	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170308.sql	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
@@ -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-4261 Remove optimistic locking management
+ALTER TABLE tl_lafrum11_tool_session DROP COLUMN version;
+
+----------------------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;
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java
===================================================================
diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r2c1a1ddb008c9257866826d3068d8ecfe0768e35
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	(.../ForumToolSession.java)	(revision 3399163940c61c9132223c758d274486e57ff9b7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	(.../ForumToolSession.java)	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
@@ -50,9 +50,6 @@
     //content topics copyed (1) or not (0)
     private int status;
 
-    //optimistic lock 
-    private int version;
-
 //  **********************************************************
     //		Function method for ForumToolSession
 //  **********************************************************
@@ -174,16 +171,4 @@
     public void setMarkReleased(boolean markReleased) {
 	this.markReleased = markReleased;
     }
-
-    /**
-     *
-     */
-    public int getVersion() {
-	return version;
-    }
-
-    public void setVersion(int version) {
-	this.version = version;
-    }
-
-}
+}
\ No newline at end of file
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r2c1a1ddb008c9257866826d3068d8ecfe0768e35
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	(.../ScribeSession.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	(.../ScribeSession.hbm.xml)	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
@@ -26,12 +26,6 @@
             </generator>
         </id>
 
-        <version
-            name="version"
-            column="version"
-            type="int"
-        />
-
         <property
             name="sessionEndDate"
             type="java.util.Date"
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170308.sql
===================================================================
diff -u
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170308.sql	(revision 0)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170308.sql	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
@@ -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-4261 Remove optimistic locking management
+ALTER TABLE tl_lascrb11_session DROP COLUMN version;
+
+----------------------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;
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java
===================================================================
diff -u -r73569905e3d3e11fdf758e84a6a5f8b8c98c6532 -r2c1a1ddb008c9257866826d3068d8ecfe0768e35
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java	(.../ScribeSession.java)	(revision 73569905e3d3e11fdf758e84a6a5f8b8c98c6532)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java	(.../ScribeSession.java)	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
@@ -40,15 +40,13 @@
 
     private static Logger log = Logger.getLogger(ScribeSession.class);
     /**
-     * 
+     *
      */
     private static final long serialVersionUID = 4407078136514639026L;
 
     // Fields
     private Long uid;
 
-    private Integer version;
-
     private Date sessionEndDate;
 
     private Date sessionStartDate;
@@ -104,18 +102,7 @@
     /**
      *
      */
-    public Integer getVersion() {
-	return version;
-    }
 
-    public void setVersion(Integer version) {
-	this.version = version;
-    }
-
-    /**
-     *
-     */
-
     public Date getSessionEndDate() {
 	return this.sessionEndDate;
     }
@@ -247,7 +234,7 @@
 
     /**
      * toString
-     * 
+     *
      * @return String
      */
     @Override
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r2c1a1ddb008c9257866826d3068d8ecfe0768e35
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 2c1a1ddb008c9257866826d3068d8ecfe0768e35)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.tool.scribe.web.actions;
 
 import java.io.IOException;
@@ -60,21 +59,7 @@
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.springframework.orm.ObjectOptimisticLockingFailureException;
 
-/**
- * @author
- * @version
- *
- *
- *
- *
- *
- *
- *
- *
- *
- */
 public class LearningAction extends LamsDispatchAction {
 
     private static Logger log = Logger.getLogger(LearningAction.class);
@@ -96,13 +81,7 @@
 	if (scribeService == null) {
 	    scribeService = ScribeServiceProxy.getScribeService(this.getServlet().getServletContext());
 	}
-	//try to clone scribe heading from content. This method will execute
-	//for every new learner enter, but the heading only copied once.
-	try {
-	    scribeService.createReportEntry(toolSessionID);
-	} catch (ObjectOptimisticLockingFailureException e) {
-	    LearningAction.log.debug("Multiple learner get into scribe simultaneously. Cloning report entry skipped");
-	}
+	scribeService.createReportEntry(toolSessionID);
 
 	// Retrieve the session and content.
 	ScribeSession scribeSession = scribeService.getSessionBySessionId(toolSessionID);
@@ -139,15 +118,7 @@
 	    } else {
 		// appoint the currentUser as the scribe
 		scribeSession.setAppointedScribe(scribeUser);
-
-		// attempt to update the scribeSession.
-		try {
-		    scribeService.saveOrUpdateScribeSession(scribeSession);
-		} catch (ObjectOptimisticLockingFailureException le) {
-		    // scribeSession has been modified. Reload scribeSession and
-		    // check again.
-		    scribeSession = scribeService.getSessionBySessionId(toolSessionID);
-		}
+		scribeService.saveOrUpdateScribeSession(scribeSession);
 	    }
 	}