Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r0336d51e6688a15639cb7d414223e947a1e8d118 -r5b3de375324cb89215865883a2658932ff2bd846
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0336d51e6688a15639cb7d414223e947a1e8d118)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5b3de375324cb89215865883a2658932ff2bd846)
@@ -140,7 +140,6 @@
 label.learning.question.summary.grade  =Grade
 label.learning.countdown.time.left  =Time left
 label.learning.blockui.time.is.over  =Time is over. Processing your answers...
-label.learning.blockui.are.you.ready  =You are going to participate in activity that has time limitation. Are you ready to start?
 monitoring.tab.summary  =Summary
 monitoring.tab.statistics  =Stats
 monitoring.tab.edit.activity  =Edit Activity
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -r998ba383ec2a06647d309f910ebefe0a33fa30a4 -r5b3de375324cb89215865883a2658932ff2bd846
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 998ba383ec2a06647d309f910ebefe0a33fa30a4)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 5b3de375324cb89215865883a2658932ff2bd846)
@@ -107,8 +107,6 @@
 
     public static final String ATTR_HAS_EDIT_RIGHT = "hasEditRight";
 
-    public static final String ATTR_IS_TIME_LIMIT_NOT_LAUNCHED = "isTimeLimitNotLaunched";
-
     public static final String ATTR_OVERALL_FEEDBACK_LIST = "overallFeedbackList";
 
     public static final String ATTR_OVERALL_FEEDBACK_COUNT = "overallFeedbackCount";
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r1ff532f29d381dbae40ea6f179058b5bd6c01b9b -r5b3de375324cb89215865883a2658932ff2bd846
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 1ff532f29d381dbae40ea6f179058b5bd6c01b9b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 5b3de375324cb89215865883a2658932ff2bd846)
@@ -296,10 +296,6 @@
 	sessionMap.put(AssessmentConstants.ATTR_REFLECTION_INSTRUCTION, assessment.getReflectInstructions());
 	sessionMap.put(AssessmentConstants.ATTR_REFLECTION_ENTRY, entryText);
 
-	//time limit
-	boolean isTimeLimitNotLaunched = (lastResult == null) || (lastResult.getTimeLimitLaunchedDate() == null);
-	sessionMap.put(AssessmentConstants.ATTR_IS_TIME_LIMIT_NOT_LAUNCHED, isTimeLimitNotLaunched);
-
 	sessionMap.put(AttributeNames.ATTR_IS_LAST_ACTIVITY, service.isLastActivity(toolSessionId));
 
 	// add define later support
@@ -643,9 +639,6 @@
 	    // clear isUserFailed indicator
 	    sessionMap.put(AssessmentConstants.ATTR_IS_USER_FAILED, false);
 
-	    // time limit feature
-	    sessionMap.put(AssessmentConstants.ATTR_IS_TIME_LIMIT_NOT_LAUNCHED, true);
-
 	    return "pages/learning/learning";
 	}
 
@@ -689,21 +682,6 @@
 	storeUserAnswersIntoDatabase(sessionMap, true);
     }
 
-    /**
-     * Stores date when user has started activity with time limit
-     */
-    @RequestMapping("/launchTimeLimit")
-    @ResponseStatus(HttpStatus.OK)
-    public void launchTimeLimit(HttpServletRequest request) {
-	SessionMap<String, Object> sessionMap = getSessionMap(request);
-
-	Long assessmentUid = ((Assessment) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT)).getUid();
-	Long userId = ((AssessmentUser) sessionMap.get(AssessmentConstants.ATTR_USER)).getUserId();
-	sessionMap.put(AssessmentConstants.ATTR_IS_TIME_LIMIT_NOT_LAUNCHED, false);
-
-	service.launchTimeLimit(assessmentUid, userId);
-    }
-
     @RequestMapping("/vsaAutocomplete")
     @ResponseBody
     public String vsaAutocomplete(HttpServletRequest request, HttpServletResponse response) {
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -r29bc39cd5828fbffdc6a414fd18b91e6a89f66c4 -r5b3de375324cb89215865883a2658932ff2bd846
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 29bc39cd5828fbffdc6a414fd18b91e6a89f66c4)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 5b3de375324cb89215865883a2658932ff2bd846)
@@ -12,9 +12,6 @@
 <c:set var="pageNumber" value="${sessionMap.pageNumber}" />
 <c:set var="isResubmitAllowed" value="${sessionMap.isResubmitAllowed}" />
 <c:set var="hasEditRight" value="${sessionMap.hasEditRight}"/>
-<%--
-<c:set var="isTimeLimitEnabled" value="${hasEditRight && assessment.relativeTimeLimit != 0}" />
- --%>
 <c:set var="secondsLeft" value="${sessionMap.secondsLeft}"/>
 <c:set var="result" value="${sessionMap.assessmentResult}" />
 <c:set var="isUserLeader" value="${sessionMap.isUserLeader}"/>
@@ -251,38 +248,6 @@
 			});
 		}
 			
-	
-		/*
-		$(document).ready(function(){
-			//show timelimit-start-dialog in order to start countdown
-			if (${sessionMap.isTimeLimitNotLaunched}) {
-				
-				$.blockUI({ 
-					message: $('#timelimit-start-dialog'), 
-					css: { width: '325px', height: '120px'}, 
-					overlayCSS: { opacity: '.98'} 
-				});
-				
-				//once OK button pressed start countdown
-		        $('#timelimit-start-ok').click(function() {
-		        	
-		        	//store date when user has started activity with time limit
-			        $.ajax({
-			        	async: true,
-			            url: '<c:url value="/learning/launchTimeLimit.do"/>',
-			            data: 'sessionMapID=${sessionMapID}',
-			            type: 'post'
-			       	});
-		        	
-		        	$.unblockUI();
-		        	initAssessmentTimeLimitWebsocket();
-		        	isWaitingForConfirmation = false;
-		        });
-				
-			} else {
-				initAssessmentTimeLimitWebsocket();
-			}
-		});*/
 		
 		//autosave feature
 		<c:if test="${hasEditRight && (mode != 'teacher')}">
@@ -609,15 +574,6 @@
 			<fmt:message key="warn.mark.hedging.wrong.justification" />
 		</lams:Alert>
 		
-		<div id="timelimit-start-dialog"> 
-	        <h4>
-	        	<fmt:message key='label.learning.blockui.are.you.ready' />
-	        </h4>
-	        <button type="button" name="ok" id="timelimit-start-ok" class="button">
-				OK
-			</button>
-		</div>
-		
 		<lams:errors/>
 		<br>