Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java
===================================================================
diff -u -r3085af1c7e3e6c3496af23a748d998886d7168fd -re581d656fb9eae279adb11f28b8419fd49cd05c2
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java	(.../ICommonAssessmentService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java	(.../ICommonAssessmentService.java)	(revision e581d656fb9eae279adb11f28b8419fd49cd05c2)
@@ -18,14 +18,9 @@
     /**
      * Returns VS answers which require allocation for the given activity
      */
-    Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswersForActivity(long toolContentId);
+    Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswers(long toolContentId);
 
     /**
-     * Returns VS answers which require allocation for the given tool question ID
-     */
-    Map<String, Integer> getUnallocatedVSAnswersForQuestion(long toolQuestionUid);
-
-    /**
      * Counts how many questions were answered correctly by the given user, regardless of the mark given.
      * Currently it only works for MCQ and mark hedging questions.
      */
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
===================================================================
diff -u -r3085af1c7e3e6c3496af23a748d998886d7168fd -re581d656fb9eae279adb11f28b8419fd49cd05c2
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(.../LamsToolService.java)	(revision e581d656fb9eae279adb11f28b8419fd49cd05c2)
@@ -538,7 +538,7 @@
 	if (tool.getToolSignature().equals(CommonConstants.TOOL_SIGNATURE_ASSESSMENT)) {
 	    ICommonAssessmentService sessionManager = (ICommonAssessmentService) lamsCoreToolService
 		    .findToolService(tool);
-	    return sessionManager.getUnallocatedVSAnswersForActivity(toolContentId);
+	    return sessionManager.getUnallocatedVSAnswers(toolContentId);
 	}
 	return null;
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r3085af1c7e3e6c3496af23a748d998886d7168fd -re581d656fb9eae279adb11f28b8419fd49cd05c2
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision e581d656fb9eae279adb11f28b8419fd49cd05c2)
@@ -1402,36 +1402,26 @@
     }
 
     @Override
-    public Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswersForActivity(long toolContentId) {
+    public Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswers(long toolContentId) {
 	Map<QbToolQuestion, Map<String, Integer>> result = new LinkedHashMap<>();
 
 	Assessment assessment = getAssessmentByContentId(toolContentId);
 	for (AssessmentQuestion question : assessment.getQuestions()) {
 	    if (question.getType().equals(QbQuestion.TYPE_VERY_SHORT_ANSWERS)) {
-		Map<String, Integer> unallocatedQuestionAnswers = getUnallocatedVSAnswersForQuestion(toolContentId,
-			question.getUid());
+		// gets mapping answer -> user ID for all answers which were not allocation into VSA option yet
+		QuestionSummary questionSummary = getQuestionSummary(toolContentId, question.getUid());
+		Map<String, Integer> unallocatedQuestionAnswers = questionSummary.getNotAllocatedQuestionResults()
+			.stream()
+			.collect(Collectors.toMap(AssessmentQuestionResult::getAnswer,
+				r -> r.getAssessmentResult().getUser().getUserId().intValue(), (user1, user2) -> user1,
+				LinkedHashMap::new));
 		result.put(question, unallocatedQuestionAnswers);
 	    }
 	}
 	return result;
     }
 
     @Override
-    public Map<String, Integer> getUnallocatedVSAnswersForQuestion(long toolQuestionUid) {
-	AssessmentQuestion question = getAssessmentQuestionByUid(toolQuestionUid);
-	return getUnallocatedVSAnswersForQuestion(question.getToolContentId(), toolQuestionUid);
-    }
-
-    private Map<String, Integer> getUnallocatedVSAnswersForQuestion(long toolContentId, long toolQuestionUid) {
-	// gets mapping answer -> user ID for all answers which were not allocation into VSA option yet
-	QuestionSummary questionSummary = getQuestionSummary(toolContentId, toolQuestionUid);
-	return questionSummary.getNotAllocatedQuestionResults().stream()
-		.collect(Collectors.toMap(AssessmentQuestionResult::getAnswer,
-			r -> r.getAssessmentResult().getUser().getUserId().intValue(), (user1, user2) -> user1,
-			LinkedHashMap::new));
-    }
-
-    @Override
     public QuestionSummary getQuestionSummary(Long contentId, Long questionUid) {
 	AssessmentQuestion question = assessmentQuestionDao.getByUid(questionUid);
 	QbQuestion qbQuestion = question.getQbQuestion();
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -r8dac82ff3870ff39cd41d273bf22f290b66994c5 -re581d656fb9eae279adb11f28b8419fd49cd05c2
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 8dac82ff3870ff39cd41d273bf22f290b66994c5)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision e581d656fb9eae279adb11f28b8419fd49cd05c2)
@@ -13,7 +13,6 @@
 		<link type="text/css" href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet">
 		<link type="text/css" href="${lams}css/free.ui.jqgrid.min.css" rel="stylesheet">
 		<link type="text/css" href="${lams}css/jquery.jqGrid.confidence-level-formattter.css" rel="stylesheet">
-		<link type="text/css" href="<lams:WebAppURL />includes/css/vsaAllocate.css" rel="stylesheet">
 		<c:if test="${not empty questionDto.codeStyle}">
 			<link rel="stylesheet" type="text/css" href="${lams}css/codemirror.css" />
 		</c:if>
@@ -53,21 +52,13 @@
 				COMMENT_TEXTAREA_TIP_LABEL = '',
 				WARN_COMMENTS_IS_BLANK_LABEL = '',
 				WARN_MIN_NUMBER_WORDS_LABEL = '';
-
-			//vars for VSA allocation
-			var VS_ANSWER_ALLOCATED_ALERT = "<fmt:message key="label.someone.allocated.this.answer" />",
-				VS_ANSWER_DEALLOCATE_CONFIRM = "<fmt:message key="label.vsa.deallocate.confirm" />",
-				WEB_APP_URL = "<lams:WebAppURL />",
-				csrfTokenName = "<csrf:tokenname/>",
-				csrfTokenValue = "<csrf:tokenvalue/>";
 		</script>
 		<script type="text/javascript" src="${lams}includes/javascript/free.jquery.jqgrid.min.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.confidence-level-formattter.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/Sortable.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
 		<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script> 	
-		<lams:JSImport src="includes/javascript/vsaAllocate.js" relative="true" />
 
 		<c:if test="${not empty questionDto.codeStyle}">
 			<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/runmode/runmode-standalone.js"></script>
@@ -335,12 +326,6 @@
 				</div>	
 			</c:forEach>
 			
-            <!--allocate responses-->
-			<c:if test="${questionDto.type == 3}">
-				<br><br>
-				<%@ include file="vsaQuestionAllocate.jsp"%>
-			</c:if>
-			
 			<div id="bottom-buttons">
 				<a href="#nogo" onclick="javascript:refreshQuestionSummaryPage()" class="btn btn-default btn-sm">
 					<i class="fa fa-refresh"></i>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -r3085af1c7e3e6c3496af23a748d998886d7168fd -re581d656fb9eae279adb11f28b8419fd49cd05c2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision e581d656fb9eae279adb11f28b8419fd49cd05c2)
@@ -2049,17 +2049,11 @@
     }
 
     @Override
-    public Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswersForActivity(long toolContentId) {
+    public Map<QbToolQuestion, Map<String, Integer>> getUnallocatedVSAnswers(long toolContentId) {
 	// MCQ does not support VSA questions
 	return null;
     }
 
-    @Override
-    public Map<String, Integer> getUnallocatedVSAnswersForQuestion(long toolQuestionUid) {
-	// MCQ does not support VSA questions
-	return null;
-    }
-
     /**
      * Counts how many questions were answered correctly by the given user, regardless of the mark given.
      */