Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java	(.../McContentDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java	(.../McContentDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -24,7 +24,6 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcContentDAO;
 import org.lamsfoundation.lams.tool.mc.pojos.McContent;
@@ -63,19 +62,16 @@
 
     @Override
     public void saveMcContent(McContent mcContent) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().saveOrUpdate(mcContent);
     }
 
     @Override
     public void updateMcContent(McContent mcContent) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().update(mcContent);
     }
 
     @Override
     public void saveOrUpdateMc(McContent mc) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().saveOrUpdate(mc);
     }
 
@@ -87,7 +83,6 @@
 
 	    if (list != null && list.size() > 0) {
 		McContent mc = (McContent) list.get(0);
-		getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 		getSession().delete(mc);
 		getSession().flush();
 	    }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	(.../McQueContentDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	(.../McQueContentDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -24,7 +24,6 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcQueContentDAO;
 import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
@@ -98,7 +97,6 @@
 
     @Override
     public void updateMcQueContent(McQueContent mcQueContent) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().saveOrUpdate(mcQueContent);
     }
 
@@ -113,9 +111,7 @@
     @Override
     public void removeMcQueContent(McQueContent mcQueContent) {
 	if ((mcQueContent != null) && (mcQueContent.getUid() != null)) {
-	    getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	    this.getSession().delete(mcQueContent);
-
 	}
     }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java	(.../McSessionDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java	(.../McSessionDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -24,7 +24,6 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcSessionDAO;
 import org.lamsfoundation.lams.tool.mc.pojos.McSession;
@@ -64,13 +63,11 @@
 
     @Override
     public void updateMcSession(McSession mcSession) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().update(mcSession);
     }
 
     @Override
     public void removeMcSession(McSession mcSession) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().delete(mcSession);
     }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
===================================================================
diff -u -r289926a27bdbc9bd2519e3064a85f489fc1845ec -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java	(.../McUserDAO.java)	(revision 289926a27bdbc9bd2519e3064a85f489fc1845ec)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java	(.../McUserDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -25,7 +25,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.hibernate.Query;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcUserDAO;
@@ -77,7 +76,6 @@
 
     @Override
     public void removeMcUser(McQueUsr mcUser) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().delete(mcUser);
     }
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
===================================================================
diff -u -r1d3ff83fba3454c6e0e4139dc15ad6cecdfa389c -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java	(.../McUsrAttemptDAO.java)	(revision 1d3ff83fba3454c6e0e4139dc15ad6cecdfa389c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java	(.../McUsrAttemptDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -25,7 +25,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.mc.dao.IMcUsrAttemptDAO;
 import org.lamsfoundation.lams.tool.mc.dto.ToolOutputDTO;
@@ -106,14 +105,11 @@
 
     @Override
     public void updateMcUsrAttempt(McUsrAttempt mcUsrAttempt) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().update(mcUsrAttempt);
     }
 
     @Override
     public void removeAllUserAttempts(Long queUserUid) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
-
 	List<McUsrAttempt> userAttempts = getSessionFactory().getCurrentSession()
 		.createQuery(LOAD_ALL_QUESTION_ATTEMPTS).setLong("queUsrUid", queUserUid.longValue()).list();
 
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java	(.../NoticeboardContentDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java	(.../NoticeboardContentDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -26,7 +26,6 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
@@ -97,7 +96,6 @@
 
 	    if (list != null && list.size() > 0) {
 		NoticeboardContent nb = (NoticeboardContent) list.get(0);
-		getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 		this.getSession().delete(nb);
 		this.getSession().flush();
 	    }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java	(.../NoticeboardSessionDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java	(.../NoticeboardSessionDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -26,7 +26,6 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
@@ -86,7 +85,6 @@
 
 	    if ((list != null) && (list.size() > 0)) {
 		NoticeboardSession nb = list.get(0);
-		getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 		getSession().delete(nb);
 		getSession().flush();
 	    }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java
===================================================================
diff -u -r56531c4382aa9cf2b2811f85401afc4539659f14 -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java	(.../VoteContentDAO.java)	(revision 56531c4382aa9cf2b2811f85401afc4539659f14)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java	(.../VoteContentDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -24,7 +24,6 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.vote.dao.IVoteContentDAO;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
@@ -55,7 +54,6 @@
 
     @Override
     public void saveOrUpdateVote(VoteContent vote) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().saveOrUpdate(vote);
     }
 
@@ -81,13 +79,11 @@
 
     @Override
     public void saveVoteContent(VoteContent voteContent) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().saveOrUpdate(voteContent);
     }
 
     @Override
     public void updateVoteContent(VoteContent voteContent) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().update(voteContent);
     }
 
@@ -100,7 +96,6 @@
 
 	    if (list != null && list.size() > 0) {
 		VoteContent vote = list.get(0);
-		getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 		getSession().delete(vote);
 		getSession().flush();
 	    }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java
===================================================================
diff -u -r56531c4382aa9cf2b2811f85401afc4539659f14 -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java	(.../VoteQueContentDAO.java)	(revision 56531c4382aa9cf2b2811f85401afc4539659f14)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java	(.../VoteQueContentDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -23,7 +23,6 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.vote.dao.IVoteQueContentDAO;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent;
@@ -95,7 +94,6 @@
 
     @Override
     public void removeQuestion(VoteQueContent voteQueContent) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().delete(voteQueContent);
     }
 }
\ No newline at end of file
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java
===================================================================
diff -u -r56531c4382aa9cf2b2811f85401afc4539659f14 -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java	(.../VoteSessionDAO.java)	(revision 56531c4382aa9cf2b2811f85401afc4539659f14)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java	(.../VoteSessionDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -24,7 +24,6 @@
 
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.vote.dao.IVoteSessionDAO;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteContent;
@@ -90,7 +89,6 @@
 
     @Override
     public void updateVoteSession(VoteSession voteSession) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().update(voteSession);
     }
 
@@ -109,7 +107,6 @@
 
 	    if (list != null && list.size() > 0) {
 		VoteSession vote = list.get(0);
-		getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 		getSession().delete(vote);
 		getSession().flush();
 	    }
@@ -119,7 +116,6 @@
 
     @Override
     public void removeVoteSession(VoteSession voteSession) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().delete(voteSession);
     }
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java
===================================================================
diff -u -r56531c4382aa9cf2b2811f85401afc4539659f14 -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java	(.../VoteUserDAO.java)	(revision 56531c4382aa9cf2b2811f85401afc4539659f14)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java	(.../VoteUserDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -25,7 +25,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.vote.dao.IVoteUserDAO;
 import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr;
@@ -129,7 +128,6 @@
 
     @Override
     public void removeVoteUser(VoteQueUsr voteUser) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().delete(voteUser);
     }
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
===================================================================
diff -u -r56531c4382aa9cf2b2811f85401afc4539659f14 -r1ac047247117455cf3ca4073958e4e2103def960
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java	(.../VoteUsrAttemptDAO.java)	(revision 56531c4382aa9cf2b2811f85401afc4539659f14)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java	(.../VoteUsrAttemptDAO.java)	(revision 1ac047247117455cf3ca4073958e4e2103def960)
@@ -30,7 +30,6 @@
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
-import org.hibernate.FlushMode;
 import org.hibernate.SQLQuery;
 import org.hibernate.transform.Transformers;
 import org.hibernate.type.BooleanType;
@@ -151,7 +150,6 @@
 	    Iterator<VoteUsrAttempt> listIterator = list.iterator();
 	    while (listIterator.hasNext()) {
 		VoteUsrAttempt attempt = listIterator.next();
-		getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 		getSession().delete(attempt);
 		getSession().flush();
 	    }
@@ -258,13 +256,11 @@
 
     @Override
     public void updateVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) {
-	getSessionFactory().getCurrentSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().update(voteUsrAttempt);
     }
 
     @Override
     public void removeVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) {
-	this.getSession().setFlushMode(FlushMode.AUTO);
 	this.getSession().delete(voteUsrAttempt);
     }