Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
===================================================================
diff -u -rfd1c6c450376476c752e6be5cb6048a2e370bd42 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java	(.../SequenceActivityAction.java)	(revision fd1c6c450376476c752e6be5cb6048a2e370bd42)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java	(.../SequenceActivityAction.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -31,7 +31,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
+import org.lamsfoundation.lams.learning.service.ILearnerFullService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceException;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
@@ -46,9 +46,6 @@
  *
  * Normally this will display the first activity inside a sequence activity. If there are no activities within the
  * sequence activity then it will display an "empty" message.
- *
- *
- *
  */
 public class SequenceActivityAction extends ActivityAction {
 
@@ -66,7 +63,7 @@
 	ActivityMapping actionMappings = LearningWebUtil.getActivityMapping(this.getServlet().getServletContext());
 	Integer learnerId = LearningWebUtil.getUserId();
 
-	ICoreLearnerService learnerService = getLearnerService();
+	ILearnerFullService learnerService = getLearnerService();
 	LearnerProgress learnerProgress = LearningWebUtil.getLearnerProgress(request, learnerService);
 	Activity activity = LearningWebUtil.getActivityFromRequest(request, learnerService);
 	if (!(activity instanceof SequenceActivity)) {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
diff -u -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -83,9 +83,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="auditService">
    			<ref bean="auditService"/>
    		</property>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r5c770157545dea3dbc72e22a1dd1107c56cf22eb -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -54,7 +54,6 @@
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -144,8 +143,6 @@
 
     private ILamsToolService toolService;
 
-    private ILearnerService learnerService;
-
     private IAuditService auditService;
 
     private IUserManagementService userManagementService;
@@ -2395,10 +2392,6 @@
 	this.auditService = auditService;
     }
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
@@ -2629,7 +2622,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find shared assessment session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml	(.../bbbApplicationContext.xml)	(revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml	(.../bbbApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -24,7 +24,6 @@
 				<property name="bbbDAO"><ref bean="bbbDAO"/></property>
 				<property name="bbbConfigDAO"><ref bean="bbbConfigDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>	
  				<property name="bbbToolContentHandler"><ref bean="bbbToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	(.../BbbService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	(.../BbbService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -41,7 +41,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -89,8 +88,6 @@
 
     private IBbbConfigDAO bbbConfigDAO = null;
 
-    private ILearnerService learnerService;
-
     private ILamsToolService toolService;
 
     private IToolContentHandler bbbToolContentHandler = null;
@@ -123,7 +120,7 @@
 
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -726,14 +723,6 @@
 	this.bbbUserDAO = userDAO;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -34,7 +34,6 @@
 				<property name="chatUserDAO"><ref bean="chatUserDAO"/></property>
 				<property name="chatDAO"><ref bean="chatDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>	
 				<property name="auditService"><ref bean="auditService"/></property>		
  				<property name="chatToolContentHandler"><ref bean="chatToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java	(.../ChatService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -40,7 +40,6 @@
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -93,8 +92,6 @@
 
     private IChatMessageDAO chatMessageDAO = null;
 
-    private ILearnerService learnerService;
-
     private ILamsToolService toolService;
 
     private IToolContentHandler chatToolContentHandler = null;
@@ -163,7 +160,7 @@
 	// + "Could not find submit file session by given session id: "
 	// + toolSessionId);
 	// }
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -718,14 +715,6 @@
 	chatMessageDAO = messageDAO;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	(.../dacoApplicationContext.xml)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml	(.../dacoApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -73,9 +73,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
    		</property>
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(.../DacoServiceImpl.java)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(.../DacoServiceImpl.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -42,7 +42,6 @@
 import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException;
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
 import org.lamsfoundation.lams.events.IEventNotificationService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -101,9 +100,7 @@
     private MessageService messageService;
 
     private ILamsToolService toolService;
-
-    private ILearnerService learnerService;
-
+    
     private IUserManagementService userManagementService;
 
     private IExportToolContentService exportContentService;
@@ -691,7 +688,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find shared daco session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -887,10 +884,6 @@
 	this.exportContentService = exportContentService;
     }
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
===================================================================
diff -u -rbc33822b9936d6c96d146ff14b775f11c46ab4b4 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	(.../LearningAction.java)	(revision bc33822b9936d6c96d146ff14b775f11c46ab4b4)
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -33,7 +33,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.RedirectingActionForward;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -51,8 +51,8 @@
 
 	WebApplicationContext wac = WebApplicationContextUtils
 		.getRequiredWebApplicationContext(getServlet().getServletContext());
-	ILearnerService learnerService = (ILearnerService) wac.getBean("learnerService");
-	String finishURL = learnerService.completeToolSession(toolSessionId, user.getUserID().longValue());
+	ILamsToolService toolService = (ILamsToolService) wac.getBean("toolService");
+	String finishURL = toolService.completeToolSession(toolSessionId, user.getUserID().longValue());
 	return new RedirectingActionForward(finishURL);
     }
 }
\ No newline at end of file
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
===================================================================
diff -u -r7a4b493a0008b281e8c3ec7aafbd325165085ed9 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml	(.../dokumaranApplicationContext.xml)	(revision 7a4b493a0008b281e8c3ec7aafbd325165085ed9)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml	(.../dokumaranApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -62,9 +62,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="auditService">
    			<ref bean="auditService"/>
    		</property>
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -43,7 +43,6 @@
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -108,8 +107,6 @@
 
     private ILamsToolService toolService;
 
-    private ILearnerService learnerService;
-
     private IAuditService auditService;
 
     private IUserManagementService userManagementService;
@@ -1002,7 +999,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find shared dokumaran session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -1059,10 +1056,6 @@
 	this.auditService = auditService;
     }
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java
===================================================================
diff -u -r3bd3be95f64eabe12ef8da8d8a7fcd9bcbd9c320 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java	(.../LearningAction.java)	(revision 3bd3be95f64eabe12ef8da8d8a7fcd9bcbd9c320)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java	(.../LearningAction.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -33,7 +33,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.RedirectingActionForward;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -51,8 +51,8 @@
 
 	WebApplicationContext wac = WebApplicationContextUtils
 		.getRequiredWebApplicationContext(getServlet().getServletContext());
-	ILearnerService learnerService = (ILearnerService) wac.getBean("learnerService");
-	String finishURL = learnerService.completeToolSession(toolSessionId, user.getUserID().longValue());
+	ILamsToolService toolService = (ILamsToolService) wac.getBean("toolService");
+	String finishURL = toolService.completeToolSession(toolSessionId, user.getUserID().longValue());
 	return new RedirectingActionForward(finishURL);
     }
 }
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -115,9 +115,6 @@
 		<property name="toolService">
 			<ref bean="lamsToolService" />
 		</property>
-		<property name="learnerService">
-			<ref bean="learnerService" />
-		</property>
 		<property name="userManagementService">
 			<ref bean="userManagementService" />
 		</property>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -51,7 +51,6 @@
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
@@ -139,8 +138,6 @@
 
     private ForumToolContentHandler forumToolContentHandler;
 
-    private ILearnerService learnerService;
-
     private IAuditService auditService;
 
     private MessageService messageService;
@@ -1124,7 +1121,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find submit file session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -1300,14 +1297,6 @@
 	forumToolContentHandler = toolContentHandler;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
===================================================================
diff -u -r57840657b3f8bbdc314d25b49371fab852bbe40f -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision 57840657b3f8bbdc314d25b49371fab852bbe40f)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml	(.../gmapApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -26,7 +26,6 @@
 				<property name="gmapMarkerDAO"><ref bean="gmapMarkerDAO"/></property>
 				<property name="gmapConfigItemDAO"><ref bean="gmapConfigItemDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>
  				<property name="gmapToolContentHandler"><ref bean="gmapToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
diff -u -r57840657b3f8bbdc314d25b49371fab852bbe40f -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 57840657b3f8bbdc314d25b49371fab852bbe40f)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -41,7 +41,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -97,8 +96,6 @@
 
     private IGmapUserDAO gmapUserDAO = null;
 
-    private ILearnerService learnerService;
-
     private ILamsToolService toolService;
 
     private IUserManagementService userManagementService;
@@ -147,7 +144,7 @@
 
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -664,14 +661,6 @@
 	gmapUserDAO = userDAO;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml
===================================================================
diff -u -r2228652cfb59ec7c0fcbb1914a94f65d22815911 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision 2228652cfb59ec7c0fcbb1914a94f65d22815911)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -90,9 +90,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="auditService">
    			<ref bean="auditService"/>
    		</property>
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -51,7 +51,6 @@
 import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException;
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
 import org.lamsfoundation.lams.events.IEventNotificationService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -136,8 +135,6 @@
 
     private ILamsToolService toolService;
 
-    private ILearnerService learnerService;
-
     private IAuditService auditService;
 
     private IUserManagementService userManagementService;
@@ -658,10 +655,6 @@
 	this.auditService = auditService;
     }
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
@@ -1026,7 +1019,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find shared imageGallery session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	(.../commonCartridgeApplicationContext.xml)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	(.../commonCartridgeApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -77,9 +77,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="auditService">
    			<ref bean="auditService"/>
    		</property>
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(.../CommonCartridgeServiceImpl.java)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(.../CommonCartridgeServiceImpl.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -45,7 +45,6 @@
 import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException;
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
 import org.lamsfoundation.lams.events.IEventNotificationService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -117,8 +116,6 @@
 
     private ILamsToolService toolService;
 
-    private ILearnerService learnerService;
-
     private IAuditService auditService;
 
     private IUserManagementService userManagementService;
@@ -520,10 +517,6 @@
 	this.auditService = auditService;
     }
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
@@ -834,7 +827,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find shared commonCartridge session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	(.../kalturaApplicationContext.xml)	(revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	(.../kalturaApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -37,7 +37,6 @@
 				<property name="kalturaCommentDao"><ref bean="kalturaCommentDao"/></property>
 				<property name="kalturaRatingDao"><ref bean="kalturaRatingDao"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>	
 				<property name="auditService"><ref bean="auditService"/></property>		
  				<property name="kalturaToolContentHandler"><ref bean="kalturaToolContentHandler"/></property>
  				<property name="userManagementService"><ref bean="userManagementService"/></property>
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	(.../KalturaService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java	(.../KalturaService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -37,7 +37,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -103,8 +102,6 @@
 
     private IKalturaUserDAO kalturaUserDao = null;
 
-    private ILearnerService learnerService;
-
     private ILamsToolService toolService;
 
     private IUserManagementService userManagementService;
@@ -144,7 +141,7 @@
 
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -702,10 +699,6 @@
 	kalturaUserDao = userDAO;
     }
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
diff -u -r68a00ed36298398bdd7646b440a122d373bd75a1 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 68a00ed36298398bdd7646b440a122d373bd75a1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -77,8 +77,7 @@
 					<property name="mcQueContentDAO"><ref bean="mcQueContentDAO"/></property>
 					<property name="mcOptionsContentDAO"><ref bean="mcOptionsContentDAO"/></property>								
 					<property name="mcUsrAttemptDAO"><ref bean="mcUsrAttemptDAO"/></property>	
-					<property name="toolService"><ref bean="lamsToolService"/></property>
-			 		<property name="learnerService"><ref bean="learnerService"/></property>		
+					<property name="toolService"><ref bean="lamsToolService"/></property>	
 					<property name="mcToolContentHandler"><ref bean="mcToolContentHandler"/></property>		
 					<property name="auditService"><ref bean="auditService"/></property>					
 					<property name="exportContentService"><ref bean="exportToolContentService"/></property>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -r5e36aad06f5b9c4fe8551ddc8af5a734ba8058bf -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 5e36aad06f5b9c4fe8551ddc8af5a734ba8058bf)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -57,7 +57,6 @@
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -133,7 +132,6 @@
 
     private IAuditService auditService;
     private IUserManagementService userManagementService;
-    private ILearnerService learnerService;
     private ILamsToolService toolService;
     private IToolContentHandler mcToolContentHandler = null;
     private IExportToolContentService exportContentService;
@@ -1463,7 +1461,7 @@
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
 
-	if (learnerService == null) {
+	if (toolService == null) {
 	    return "dummyNextUrl";
 	}
 
@@ -1488,7 +1486,7 @@
 	mcSession.setSessionStatus(McAppConstants.COMPLETED);
 	mcSessionDAO.updateMcSession(mcSession);
 
-	String nextUrl = learnerService.completeToolSession(toolSessionId, learnerId);
+	String nextUrl = toolService.completeToolSession(toolSessionId, learnerId);
 	if (nextUrl == null) {
 	    logger.error("nextUrl is null");
 	    throw new ToolException("nextUrl is null");
@@ -1694,14 +1692,6 @@
 	this.mcToolContentHandler = mcToolContentHandler;
     }
 
-    /**
-     * @param learnerService
-     *            The learnerService to set.
-     */
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setExportContentService(IExportToolContentService exportContentService) {
 	this.exportContentService = exportContentService;
     }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -78,8 +78,7 @@
 					<property name="qaUsrRespDAO"><ref bean="qaUsrRespDAO"/></property>	
 					<property name="qaConfigItemDAO"><ref bean="qaConfigItemDAO"/></property>
 					<property name="qaWizardDAO"><ref bean="qaWizardDAO"/></property>								
-					<property name="toolService"><ref bean="lamsToolService"/></property>
-					<property name="learnerService"><ref bean="learnerService"/></property>			
+					<property name="toolService"><ref bean="lamsToolService"/></property>		
 					<property name="auditService"><ref bean="auditService"/></property>
 					<property name="qaOutputFactory"><ref bean="qaOutputFactory"/></property>
 					<property name="qaToolContentHandler"><ref bean="qaToolContentHandler"/></property>								
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java	(.../QaService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -45,7 +45,6 @@
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.events.IEventNotificationService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -115,7 +114,6 @@
     private IToolContentHandler qaToolContentHandler = null;
     private IUserManagementService userManagementService;
     private ILamsToolService toolService;
-    private ILearnerService learnerService;
     private IAuditService auditService;
     private IExportToolContentService exportContentService;
     private QaOutputFactory qaOutputFactory;
@@ -822,7 +820,7 @@
 	updateSession(qaSession);
 
 	try {
-	    String nextUrl = learnerService.completeToolSession(toolSessionId, learnerId);
+	    String nextUrl = toolService.completeToolSession(toolSessionId, learnerId);
 	    return nextUrl;
 	} catch (DataAccessException e) {
 	    throw new ToolException("Exception occured when user is leaving tool session: " + e);
@@ -998,10 +996,6 @@
 	return userManagementService;
     }
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setQaDAO(IQaContentDAO qaDAO) {
 	this.qaDAO = qaDAO;
     }
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -73,9 +73,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="auditService">
    			<ref bean="auditService"/>
    		</property>
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java	(.../ResourceServiceImpl.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -53,7 +53,6 @@
 import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException;
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
 import org.lamsfoundation.lams.events.IEventNotificationService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -132,8 +131,6 @@
 
     private ILamsToolService toolService;
 
-    private ILearnerService learnerService;
-
     private IAuditService auditService;
 
     private IUserManagementService userManagementService;
@@ -974,7 +971,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find shared resource session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -1051,10 +1048,6 @@
 	this.auditService = auditService;
     }
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	(.../leaderselectionApplicationContext.xml)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/leaderselectionApplicationContext.xml	(.../leaderselectionApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -33,7 +33,6 @@
 				<property name="leaderselectionUserDAO"><ref bean="leaderselectionUserDAO"/></property>
 				<property name="leaderselectionDAO"><ref bean="leaderselectionDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>
  				<property name="leaderselectionToolContentHandler"><ref bean="leaderselectionToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	(.../LeaderselectionService.java)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	(.../LeaderselectionService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -35,7 +35,6 @@
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -81,8 +80,6 @@
 
     private ILeaderselectionUserDAO leaderselectionUserDAO = null;
 
-    private ILearnerService learnerService;
-
     private ILamsToolService toolService;
 
     private IToolContentHandler leaderselectionToolContentHandler = null;
@@ -117,7 +114,7 @@
 
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -510,14 +507,6 @@
 	leaderselectionUserDAO = userDAO;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	(.../mindmapApplicationContext.xml)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	(.../mindmapApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -38,7 +38,6 @@
 				<property name="mindmapRequestDAO"><ref bean="mindmapRequestDAO"/></property>
 				<property name="mindmapDAO"><ref bean="mindmapDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>	
 				<property name="auditService"><ref bean="auditService"/></property>		
  				<property name="mindmapToolContentHandler"><ref bean="mindmapToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java	(.../MindmapService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -37,7 +37,6 @@
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -98,7 +97,6 @@
     private IMindmapUserDAO mindmapUserDAO = null;
     private IMindmapNodeDAO mindmapNodeDAO = null;
     private IMindmapRequestDAO mindmapRequestDAO = null;
-    private ILearnerService learnerService;
     private ILamsToolService toolService;
     private IToolContentHandler mindmapToolContentHandler = null;
     private IAuditService auditService = null;
@@ -138,7 +136,7 @@
 
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -828,14 +826,6 @@
 	mindmapUserDAO = userDAO;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(.../nbApplicationContext.xml)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(.../nbApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -25,8 +25,7 @@
 				<property name="nbContentDAO"><ref bean="nbContentDAO"/></property>
 				<property name="nbSessionDAO"><ref bean="nbSessionDAO"/></property>
 				<property name="nbUserDAO"><ref bean="nbUserDAO"/></property>
-				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>			
+				<property name="toolService"><ref bean="lamsToolService"/></property>	
 				<property name="nbToolContentHandler"><ref bean="nbToolContentHandler"/></property>			
 				<property name="exportContentService"><ref bean="exportToolContentService"/></property>
 				<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java	(.../NoticeboardService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java	(.../NoticeboardService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -38,7 +38,6 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.contentrepository.exception.ItemNotFoundException;
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -78,7 +77,6 @@
 	implements INoticeboardService, ToolContentManager, ToolSessionManager, ToolRestManager {
     private static Logger log = Logger.getLogger(NoticeboardService.class);
 
-    private ILearnerService learnerService;
     private ILamsToolService toolService;
     private IExportToolContentService exportContentService;
     private IToolContentHandler nbToolContentHandler;
@@ -496,7 +494,7 @@
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
 	getAndCheckSessionIDandObject(toolSessionId);
 
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -567,10 +565,6 @@
 	this.nbUserDAO = nbUserDAO;
     }
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setToolService(ILamsToolService toolService) {
 	this.toolService = toolService;
     }
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
===================================================================
diff -u -r8e090b3ddf269cdffececa4bc55a9333da5b0858 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision 8e090b3ddf269cdffececa4bc55a9333da5b0858)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -32,7 +32,6 @@
 				<property name="notebookUserDAO"><ref bean="notebookUserDAO"/></property>
 				<property name="notebookDAO"><ref bean="notebookDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>	
 				<property name="auditService"><ref bean="auditService"/></property>		
  				<property name="notebookToolContentHandler"><ref bean="notebookToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java	(.../NotebookService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -38,7 +38,6 @@
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.events.IEventNotificationService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -89,8 +88,6 @@
 
     private INotebookUserDAO notebookUserDAO = null;
 
-    private ILearnerService learnerService;
-
     private ILamsToolService toolService;
 
     private IToolContentHandler notebookToolContentHandler = null;
@@ -135,7 +132,7 @@
 
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -550,14 +547,6 @@
 	notebookUserDAO = userDAO;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -34,7 +34,6 @@
 				<property name="pixlrConfigItemDAO"><ref bean="pixlrConfigItemDAO"/></property>
 				<property name="pixlrDAO"><ref bean="pixlrDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>	
 				<property name="auditService"><ref bean="auditService"/></property>		
  				<property name="pixlrToolContentHandler"><ref bean="pixlrToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	(.../PixlrService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java	(.../PixlrService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -34,7 +34,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -86,8 +85,6 @@
 
     private IPixlrUserDAO pixlrUserDAO = null;
 
-    private ILearnerService learnerService;
-
     private ILamsToolService toolService;
 
     private IToolContentHandler pixlrToolContentHandler = null;
@@ -127,7 +124,7 @@
 
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -648,14 +645,6 @@
 	pixlrUserDAO = userDAO;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml
===================================================================
diff -u -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml	(.../peerreviewApplicationContext.xml)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml	(.../peerreviewApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -53,9 +53,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
    		</property>
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
diff -u -r58de3acfcde3052a939146df7d0172599e56633a -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 58de3acfcde3052a939146df7d0172599e56633a)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -47,7 +47,6 @@
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.events.IEventNotificationService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -111,8 +110,6 @@
 
     private ILamsToolService toolService;
 
-    private ILearnerService learnerService;
-
     private IUserManagementService userManagementService;
 
     private IExportToolContentService exportContentService;
@@ -774,7 +771,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find peerreview session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -890,10 +887,6 @@
     // set methods for Spring Bean
     // *****************************************************************************
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -53,7 +53,6 @@
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -117,8 +116,6 @@
 
     private ILamsToolService toolService;
 
-    private ILearnerService learnerService;
-
     private IExportToolContentService exportContentService;
 
     private ICoreNotebookService coreNotebookService;
@@ -458,7 +455,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find submit file session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -1159,14 +1156,6 @@
 	submitUserDAO = learnerDAO;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public ILamsToolService getToolService() {
 	return toolService;
     }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -r4ee1866ff667d5130621844d9667ed91bfdccf93 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 4ee1866ff667d5130621844d9667ed91bfdccf93)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -48,7 +48,6 @@
 		<property name="submissionDetailsDAO"><ref bean="submissionDetailsDAO"/></property>
 		<property name="submitUserDAO"><ref bean="submitUserDAO"/></property>
 		<property name="sbmtToolContentHandler"><ref bean="sbmtToolContentHandler"/></property>
-		<property name="learnerService"><ref bean="learnerService"/></property>
 		<property name="toolService"><ref bean="lamsToolService"/></property>
 		<property name="exportContentService"><ref bean="exportToolContentService"/></property>
 		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>		
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
diff -u -rbbe9589ceab063d62380b9fe3f02648a4581e109 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision bbe9589ceab063d62380b9fe3f02648a4581e109)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -98,9 +98,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
    		</property>
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -52,7 +52,6 @@
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -140,8 +139,6 @@
 
     private ILamsToolService toolService;
 
-    private ILearnerService learnerService;
-
     private IUserManagementService userManagementService;
 
     private IExportToolContentService exportContentService;
@@ -1779,9 +1776,6 @@
     // *****************************************************************************
     // set methods for Spring Bean
     // *****************************************************************************
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
 
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
@@ -2067,7 +2061,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find shared scratchie session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml
===================================================================
diff -u -re1312708b95d2a0343c95cadbf03432d65c7657c -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	(.../scribeApplicationContext.xml)	(revision e1312708b95d2a0343c95cadbf03432d65c7657c)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml	(.../scribeApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -24,7 +24,6 @@
 				<property name="scribeHeadingDAO"><ref bean="lascrbScribeHeadingDAO"/></property>
 				<property name="scribeDAO"><ref bean="lascrbScribeDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>	
 				<property name="scribeToolContentHandler"><ref bean="lascrbScribeToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -39,7 +39,6 @@
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -90,8 +89,6 @@
 
     private IScribeUserDAO scribeUserDAO = null;
 
-    private ILearnerService learnerService;
-
     private ILamsToolService toolService;
 
     private IToolContentHandler scribeToolContentHandler = null;
@@ -126,7 +123,7 @@
 
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -574,14 +571,6 @@
 	scribeUserDAO = userDAO;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	(.../SpreadsheetServiceImpl.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	(.../SpreadsheetServiceImpl.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -36,7 +36,6 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -90,7 +89,6 @@
     private MessageService messageService;
     // system services
     private ILamsToolService toolService;
-    private ILearnerService learnerService;
     private IUserManagementService userManagementService;
     private IExportToolContentService exportContentService;
     private ICoreNotebookService coreNotebookService;
@@ -370,10 +368,6 @@
     // *****************************************************************************
     // set methods for Spring Bean
     // *****************************************************************************
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
@@ -624,7 +618,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find shared spreadsheet session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml
===================================================================
diff -u -r55a6c39f478a170c3efe15e3749b952fdb6c5710 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	(.../spreadsheetApplicationContext.xml)	(revision 55a6c39f478a170c3efe15e3749b952fdb6c5710)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml	(.../spreadsheetApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -73,9 +73,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
    		</property>
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	(.../SurveyServiceImpl.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -43,7 +43,6 @@
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.events.IEventNotificationService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -113,8 +112,6 @@
 
     private ILamsToolService toolService;
 
-    private ILearnerService learnerService;
-
     private IUserManagementService userManagementService;
 
     private IExportToolContentService exportContentService;
@@ -823,7 +820,7 @@
 	    SurveyServiceImpl.log.error("Fail to leave tool Session based on null learner.");
 	    throw new ToolException("Fail to remove tool Session based on null learner.");
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -872,10 +869,6 @@
     // set methods for Spring Bean
     // *****************************************************************************
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	(.../surveyApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -73,9 +73,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
    		</property>
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -42,7 +42,6 @@
 import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.contentrepository.exception.InvalidParameterException;
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -106,7 +105,6 @@
     private TaskListOutputFactory taskListOutputFactory;
     // system services
     private ILamsToolService toolService;
-    private ILearnerService learnerService;
     private IUserManagementService userManagementService;
     private IExportToolContentService exportContentService;
     private ICoreNotebookService coreNotebookService;
@@ -485,10 +483,6 @@
     // Set methods for Spring Bean
     // *****************************************************************************
 
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
@@ -835,7 +829,7 @@
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find shared taskList session by given session id: " + toolSessionId);
 	}
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -83,9 +83,6 @@
    		<property name="toolService">
    			<ref bean="lamsToolService"/>
    		</property>
-   		<property name="learnerService">
-   			<ref bean="learnerService"/>
-   		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
    		</property>
Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java
===================================================================
diff -u -r1b8e236ea17be319274b3a8d2196ae798964b363 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 1b8e236ea17be319274b3a8d2196ae798964b363)
+++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -32,7 +32,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.RedirectingActionForward;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
@@ -51,8 +51,8 @@
 
 	WebApplicationContext wac = WebApplicationContextUtils
 		.getRequiredWebApplicationContext(getServlet().getServletContext());
-	ILearnerService learnerService = (ILearnerService) wac.getBean("learnerService");
-	String finishURL = learnerService.completeToolSession(toolSessionId, user.getUserID().longValue());
+	ILamsToolService toolService = (ILamsToolService) wac.getBean("toolService");
+	String finishURL = toolService.completeToolSession(toolSessionId, user.getUserID().longValue());
 	return new RedirectingActionForward(finishURL);
     }
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java	(.../VoteService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java	(.../VoteService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -48,7 +48,6 @@
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.DataFlowObject;
 import org.lamsfoundation.lams.learningdesign.dao.IDataFlowDAO;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
@@ -122,16 +121,13 @@
     private IVoteUsrAttemptDAO voteUsrAttemptDAO;
 
     private IUserManagementService userManagementService;
-    private ILearnerService learnerService;
     private IAuditService auditService;
     private ILamsToolService toolService;
     private IExportToolContentService exportContentService;
-
     private ICoreNotebookService coreNotebookService;
     private IToolContentHandler voteToolContentHandler = null;
     private VoteOutputFactory voteOutputFactory;
     private IDataFlowDAO dataFlowDAO;
-
     private MessageService messageService;
 
     public VoteService() {
@@ -1485,10 +1481,6 @@
     @Override
     public String leaveToolSession(Long toolSessionID, Long learnerId) throws DataMissingException, ToolException {
 
-	if (learnerService == null) {
-	    return "dummyNextUrl";
-	}
-
 	if (learnerId == null) {
 	    logger.error("learnerId is null");
 	    throw new DataMissingException("learnerId is missing");
@@ -1511,7 +1503,7 @@
 	voteSession.setSessionStatus(VoteAppConstants.COMPLETED);
 	voteSessionDAO.updateVoteSession(voteSession);
 
-	String nextUrl = learnerService.completeToolSession(toolSessionID, learnerId);
+	String nextUrl = toolService.completeToolSession(toolSessionID, learnerId);
 	if (nextUrl == null) {
 	    logger.error("nextUrl is null");
 	    throw new ToolException("nextUrl is null");
@@ -1762,21 +1754,6 @@
     }
 
     /**
-     * @return Returns the learnerService.
-     */
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    /**
-     * @param learnerService
-     *            The learnerService to set.
-     */
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
-    /**
      * @return Returns the voteContentDAO.
      */
     public IVoteContentDAO getVoteContentDAO() {
@@ -1930,7 +1907,7 @@
     @Override
     public ToolOutput getToolInput(Long requestingToolContentId, Integer learnerId) {
 	// just forwarding to learner service
-	return learnerService.getToolInput(requestingToolContentId, VoteAppConstants.DATA_FLOW_OBJECT_ASSIGMENT_ID,
+	return toolService.getToolInput(requestingToolContentId, VoteAppConstants.DATA_FLOW_OBJECT_ASSIGMENT_ID,
 		learnerId);
     }
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -67,8 +67,7 @@
 					<property name="voteQueContentDAO"><ref bean="voteQueContentDAO"/></property>
 					<property name="voteUsrAttemptDAO"><ref bean="voteUsrAttemptDAO"/></property>
 			 		<property name="dataFlowDAO"><ref bean="dataFlowDAO"/></property>
-					<property name="toolService"><ref bean="lamsToolService"/></property>
-			 		<property name="learnerService"><ref bean="learnerService"/></property>		
+					<property name="toolService"><ref bean="lamsToolService"/></property>	
 					<property name="auditService"><ref bean="auditService"/></property>			 		
 					<property name="voteToolContentHandler"><ref bean="voteToolContentHandler"/></property>		
 			   		<property name="exportContentService"><ref bean="exportToolContentService"/></property>						
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -40,7 +40,6 @@
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.events.IEventNotificationService;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -99,8 +98,6 @@
 
     private IWikiUserDAO wikiUserDAO = null;
 
-    private ILearnerService learnerService;
-
     private ILamsToolService toolService;
 
     private IToolContentHandler wikiToolContentHandler = null;
@@ -180,7 +177,7 @@
 
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-	return learnerService.completeToolSession(toolSessionId, learnerId);
+	return toolService.completeToolSession(toolSessionId, learnerId);
     }
 
     @Override
@@ -953,14 +950,6 @@
 	wikiUserDAO = userDAO;
     }
 
-    public ILearnerService getLearnerService() {
-	return learnerService;
-    }
-
-    public void setLearnerService(ILearnerService learnerService) {
-	this.learnerService = learnerService;
-    }
-
     public IExportToolContentService getExportContentService() {
 	return exportContentService;
     }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
===================================================================
diff -u -r09dafa805c15b342353c81b85f9d3a237581df2e -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 09dafa805c15b342353c81b85f9d3a237581df2e)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml	(.../wikiApplicationContext.xml)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -25,7 +25,6 @@
 				<property name="wikiPageDAO"><ref bean="wikiPageDAO"/></property>
 				<property name="wikiPageContentDAO"><ref bean="wikiPageContentDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
-				<property name="learnerService"><ref bean="learnerService"/></property>	
  				<property name="wikiToolContentHandler"><ref bean="wikiToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java
===================================================================
diff -u -r0110ae0b586fbdc8a3c3f7046007a712660f2f4f -r02b9b123b891e60b57f7081ef284da2d41bc1253
--- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 0110ae0b586fbdc8a3c3f7046007a712660f2f4f)
+++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 02b9b123b891e60b57f7081ef284da2d41bc1253)
@@ -32,7 +32,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.RedirectingActionForward;
-import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
@@ -52,8 +52,8 @@
 
 	WebApplicationContext wac = WebApplicationContextUtils
 		.getRequiredWebApplicationContext(getServlet().getServletContext());
-	ILearnerService learnerService = (ILearnerService) wac.getBean("learnerService");
-	String finishURL = learnerService.completeToolSession(toolSessionId, user.getUserID().longValue());
+	ILamsToolService toolService = (ILamsToolService) wac.getBean("toolService");
+	String finishURL = toolService.completeToolSession(toolSessionId, user.getUserID().longValue());
 	return new RedirectingActionForward(finishURL);
     }
 }
\ No newline at end of file