Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
diff -u -r970546106e9b05a4d1a507b26be2ce96130b4f01 -r4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 970546106e9b05a4d1a507b26be2ce96130b4f01)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7)
@@ -68,14 +68,11 @@
     private static ILearningDesignService learningDesignService;
     private static ISecurityService securityService;
 
-    private Integer stateId = OrganisationState.ACTIVE;
-
     @Override
     @SuppressWarnings({ "unchecked" })
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
-	stateId = WebUtil.readIntParam(request, "stateId", false);
 	Integer orgId = WebUtil.readIntParam(request, "orgId", false);
 
 	Organisation org = null;
@@ -132,7 +129,7 @@
 	// First, populate header part
 	List<IndexLinkBean> links = new ArrayList<IndexLinkBean>();
 	List<IndexLinkBean> moreLinks = new ArrayList<IndexLinkBean>();
-	if (isSysAdmin && stateId.equals(OrganisationState.ACTIVE)) {
+	if (isSysAdmin) {
 	    if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
 		moreLinks.add(new IndexLinkBean("index.classman",
 			"javascript:openOrgManagement(" + org.getOrganisationId() + ")", "fa fa-fw fa-users", null));
@@ -144,8 +141,8 @@
 	    links.add(new IndexLinkBean("index.coursegradebook.learner", link, "fa fa-fw fa-list-ol", null));
 	}
 
-	if ((roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER)
-		|| roles.contains(Role.ROLE_MONITOR)) && stateId.equals(OrganisationState.ACTIVE)) {
+	if (roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER)
+		|| roles.contains(Role.ROLE_MONITOR)) {
 	    if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
 		if ((!isSysAdmin)
 			&& (roles.contains(Role.ROLE_GROUP_ADMIN) || roles.contains(Role.ROLE_GROUP_MANAGER))) {
@@ -204,12 +201,6 @@
 	orgBean.setLinks(links);
 	orgBean.setMoreLinks(moreLinks);
 
-	// set archived date if archived
-	if (stateId.equals(OrganisationState.ARCHIVED)
-		&& org.getOrganisationState().getOrganisationStateId().equals(OrganisationState.ARCHIVED)) {
-	    orgBean.setArchivedDate(org.getArchivedDate());
-	}
-
 	// now populate group contents
 	orgBean = populateContentsOrgBean(orgBean, org, roles, username, isSysAdmin);
 
@@ -235,7 +226,7 @@
 
 	    List<IndexOrgBean> childOrgBeans = new ArrayList<IndexOrgBean>();
 	    for (Organisation organisation : children) {
-		if (organisation.getOrganisationState().getOrganisationStateId().equals(stateId)) {
+		if (OrganisationState.ACTIVE.equals(organisation.getOrganisationState().getOrganisationStateId())) {
 		    List<Integer> classRoles = new ArrayList<Integer>();
 		    List<UserOrganisationRole> userOrganisationRoles = getService()
 			    .getUserOrganisationRoles(organisation.getOrganisationId(), username);
@@ -285,7 +276,7 @@
 	    LinkedList<IndexLinkBean> lessonLinks = new LinkedList<IndexLinkBean>();
 	    String url = null;
 	    Integer lessonStateId = bean.getState();
-	    if (stateId.equals(OrganisationState.ACTIVE) && roles.contains(Role.ROLE_LEARNER)
+	    if (roles.contains(Role.ROLE_LEARNER)
 		    && (lessonStateId.equals(Lesson.STARTED_STATE) || lessonStateId.equals(Lesson.FINISHED_STATE))) {
 		url = "javascript:openLearner(" + bean.getId() + ")";
 	    }
@@ -317,8 +308,7 @@
 		lessonLinks = new LinkedList<IndexLinkBean>();
 	    }
 
-	    if ((isGroupManagerOrMonitor && stateId.equals(OrganisationState.ACTIVE))
-		    || (stateId.equals(OrganisationState.ARCHIVED) && roles.contains(Role.ROLE_GROUP_MANAGER))) {
+	    if (isGroupManagerOrMonitor) {
 		lessonLinks.addFirst(new IndexLinkBean("index.monitor",
 			"javascript:showMonitorLessonDialog(" + bean.getId() + ")", "fa fa-fw fa-heartbeat", null));
 	    }
Index: lams_central/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r150ee5723eaf0cca2ff5add0974b52ed0f95045b -r4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7
--- lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 150ee5723eaf0cca2ff5add0974b52ed0f95045b)
+++ lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7)
@@ -533,12 +533,12 @@
     >
       <forward
         name="profile"
-        path="/index.do?state=active&amp;method=profile"
+        path="/index.do?method=profile"
         redirect="true"
       />
       <forward
         name="editprofile"
-        path="/index.do?state=active&amp;method=editprofile"
+        path="/index.do?method=editprofile"
         redirect="false"
       />
     </action>
@@ -592,12 +592,12 @@
     >
       <forward
         name="profile"
-        path="/index.do?state=active&amp;method=profile"
+        path="/index.do?method=profile"
         redirect="false"
       />
       <forward
         name="errors"
-        path="/index.do?state=active&amp;method=portrait"
+        path="/index.do?method=portrait"
         redirect="false"
       />
     </action>
@@ -681,12 +681,12 @@
       />
       <forward
         name="cancelled"
-        path="/index.do?state=active&amp;method=profile"
+        path="/index.do?method=profile"
         redirect="false"
       />
       <forward
         name="errors"
-        path="/index.do?state=active&amp;method=password"
+        path="/index.do?method=password"
         redirect="false"
       />
     </action>
Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -rbe5ab53637771eb42619ae219b0c0efb3f1a3404 -r4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision be5ab53637771eb42619ae219b0c0efb3f1a3404)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7)
@@ -134,7 +134,6 @@
 	$("#org-container").load(
 		"displayGroup.do",
 		{
-			stateId : stateId,
 			orgId   : activeOrgId
 		},
 		function( response, status, xhr ) {
Index: lams_central/web/lessons.jsp
===================================================================
diff -u -r353fe07604639c2166ed68fbf832810959f3f3cf -r4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7
--- lams_central/web/lessons.jsp	(.../lessons.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
+++ lams_central/web/lessons.jsp	(.../lessons.jsp)	(revision 4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7)
@@ -75,7 +75,7 @@
 					<div align="center">
 						<input class="btn btn-sm btn-default offset5" type="button"
 							value="<fmt:message key="label.return.to.myprofile" />"
-							onclick="javascript:document.location='index.do?state=active&method=profile'" />
+							onclick="javascript:document.location='index.do?method=profile'" />
 					</div>
 
 				</div>
Index: lams_central/web/main.jsp
===================================================================
diff -u -r9215bdc1670a10e0a55aef21bedce446eb460082 -r4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 9215bdc1670a10e0a55aef21bedce446eb460082)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7)
@@ -87,7 +87,6 @@
 				EMAIL_TITLE : '<fmt:message key="label.email"/>',
 
 			},
-			stateId = 1, // TODO Figure out when stateId is required to be equal 3. Old version code: stateId = tabName == 'profile' ? 3 : 1;
 			activeOrgId = <c:choose><c:when test="${empty lastVisitedOrganisationId}">null</c:when><c:otherwise>${lastVisitedOrganisationId}</c:otherwise></c:choose>;
 
 		$(document).ready(function(){
Index: lams_central/web/profile.jsp
===================================================================
diff -u -rf290dd48e471facda515082e1436faa2235143f2 -r4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision f290dd48e471facda515082e1436faa2235143f2)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision 4ce511c4d6fb96b1ad07ef0853168c28cc23ebc7)
@@ -62,7 +62,7 @@
 					<!-- Split button -->
 					<div class="col-xs-12 text-center">
 						<a class="btn btn-sm btn-default offset5"
-							href="index.do?state=active&method=editprofile" role="button"><i
+							href="index.do?method=editprofile" role="button"><i
 							class="fa fa-fw fa-pencil"></i> <span class="hidden-xs"><fmt:message
 									key="title.profile.edit.screen" /></span></i></a>&nbsp;&nbsp;
 						<c:set var="authenticationMethodId">
@@ -72,18 +72,18 @@
 						<c:if test="${authenticationMethodId eq dbId}">
 
 							<a class="btn btn-sm btn-default voffset5"
-								href="index.do?state=active&method=password&redirectURL=index.do%3Fstate%3Dactive%26method%3Dprofile" role="button"><i
+								href="index.do?method=password&redirectURL=index.do%3Fstate%3Dactive%26method%3Dprofile" role="button"><i
 								class="fa fa-fw fa-lock"></i> <span class="hidden-xs"><fmt:message
 										key="title.password.change.screen" /></span></i></a>
 						</c:if>
 						<a class="btn btn-sm btn-default offset5"
-							href="index.do?state=active&method=portrait" role="button"><i
+							href="index.do?method=portrait" role="button"><i
 							class="fa fa-fw fa-camera"></i> <span class="hidden-xs"><fmt:message
 									key="title.portrait.change.screen" /></span></i></a>&nbsp;&nbsp;
 
 						<c:if test="${showAllMyLessonLink}">
 							<a class="btn btn-sm btn-default offset5"
-								href="index.do?state=active&method=lessons" role="button"><i
+								href="index.do?method=lessons" role="button"><i
 								class="fa fa-fw fa-book"></i> <span class="hidden-xs"><fmt:message
 										key="title.all.my.lessons" /></span></i></a>
 						</c:if>