Index: lams_tool_leader/.classpath
===================================================================
diff -u -r9218936edd87260de73e773054cb605a336133b1 -rc0c1b666d8bd0a430f4b1e5f871232ab5d38f93b
--- lams_tool_leader/.classpath	(.../.classpath)	(revision 9218936edd87260de73e773054cb605a336133b1)
+++ lams_tool_leader/.classpath	(.../.classpath)	(revision c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b)
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.0.10.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
@@ -28,5 +27,6 @@
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/websocket/api/main/jboss-websocket-api_1.1_spec-1.1.1.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/websocket"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/noStruts"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java
===================================================================
diff -u -ra5ee55c529ff5dbfb9e102604f7f253c141861ba -rc0c1b666d8bd0a430f4b1e5f871232ab5d38f93b
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java	(.../LearningController.java)	(revision a5ee55c529ff5dbfb9e102604f7f253c141861ba)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningController.java	(.../LearningController.java)	(revision c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b)
@@ -30,7 +30,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForward;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
@@ -150,7 +149,7 @@
     }
 
     @RequestMapping("/finishActivity")
-    public ActionForward finishActivity(HttpServletRequest request, HttpServletResponse response) {
+    public String finishActivity(HttpServletRequest request, HttpServletResponse response) {
 
 	Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/forms/AuthoringForm.java
===================================================================
diff -u -ra5ee55c529ff5dbfb9e102604f7f253c141861ba -rc0c1b666d8bd0a430f4b1e5f871232ab5d38f93b
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision a5ee55c529ff5dbfb9e102604f7f253c141861ba)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/forms/AuthoringForm.java	(.../AuthoringForm.java)	(revision c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b)
@@ -21,17 +21,8 @@
  * ****************************************************************
  */
 
-
-
 package org.lamsfoundation.lams.tool.leaderselection.web.forms;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
@@ -61,8 +52,6 @@
 
     private SessionMap sessionMap;
 
-
-
     public String getSessionMapID() {
 	return sessionMapID;
     }
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tiles-defs.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_leader/web/WEB-INF/web.xml
===================================================================
diff -u -rc50f8841ee2ef0ada48c7678eefb14b8f597ff2c -rc0c1b666d8bd0a430f4b1e5f871232ab5d38f93b
--- lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision c50f8841ee2ef0ada48c7678eefb14b8f597ff2c)
+++ lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b)
@@ -113,41 +113,6 @@
 	<jsp-config>
 
 		<!-- ======================================================== -->
-		<!-- Struts Tag Library Descriptors -->
-		<!-- ======================================================== -->
-		<taglib>
-			<taglib-uri>tags-bean</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-bean-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-bean-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-html-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-html-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-logic-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-logic-el.tld</taglib-location>
-		</taglib>
-		<taglib>
-			<taglib-uri>tags-tiles-el</taglib-uri>
-			<taglib-location>/WEB-INF/tlds/struts/struts-tiles-el.tld</taglib-location>
-		</taglib>
-		<!-- ======================================================== -->
 		<!-- JSTL 1.2 Tag Library -->
 		<!-- ======================================================== -->
 		<taglib>
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/layouts/defaultLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/layouts/learningLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/layouts/tabLayout.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/pages/authoring/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag c0c1b666d8bd0a430f4b1e5f871232ab5d38f93b refers to a dead (removed) revision in file `lams_tool_leader/web/pages/monitoring/headItems.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?