Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -rdb0095c7ccb1a6c3bdbce14f3ca019ac106bc1e5
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision db0095c7ccb1a6c3bdbce14f3ca019ac106bc1e5)
@@ -75,9 +75,6 @@
     @Qualifier("laasseAssessmentService")
     private ICommonAssessmentService commonAssessmentService;
     @Autowired
-    @Qualifier("mcService")
-    private ICommonAssessmentService commonMcqService;
-    @Autowired
     @Qualifier("scratchieService")
     private ICommonScratchieService commonScratchieService;
 
@@ -108,17 +105,15 @@
 	TblMonitoringController.setupAvailableActivityTypes(request, lessonActivities);
 	boolean isTraAvailable = (request.getAttribute("isScratchieAvailable") != null)
 		&& ((Boolean) request.getAttribute("isScratchieAvailable"));
-	boolean isIraAssesmentAvailable = request.getAttribute("isIraAssessmentAvailable") != null
+	boolean isIraAvailable = request.getAttribute("isIraAssessmentAvailable") != null
 		&& ((Boolean) request.getAttribute("isIraAssessmentAvailable"));
-	boolean isIraMcqAvailable = request.getAttribute("isIraMcqAvailable") != null
-		&& ((Boolean) request.getAttribute("isIraMcqAvailable"));
 	Long iraToolActivityId = request.getAttribute("iraToolActivityId") == null ? null
 		: (Long) request.getAttribute("iraToolActivityId");
 	Long traToolActivityId = request.getAttribute("traToolActivityId") == null ? null
 		: (Long) request.getAttribute("traToolActivityId");
 	Long leaderselectionToolActivityId = request.getAttribute("leaderselectionToolActivityId") == null ? null
 		: (Long) request.getAttribute("leaderselectionToolActivityId");
-	Long iraToolContentId = isIraMcqAvailable || isIraAssesmentAvailable
+	Long iraToolContentId = isIraAvailable
 		? activityDAO.find(ToolActivity.class, iraToolActivityId).getToolContentId()
 		: null;
 	Long traToolContentId = isTraAvailable
@@ -143,9 +138,7 @@
 	Set<Group> groups = grouping == null ? null : grouping.getGroups();
 
 	Map<Integer, Integer> iraCorrectAnswerCountByUser = Map.of();
-	if (isIraMcqAvailable) {
-	    iraCorrectAnswerCountByUser = commonMcqService.countCorrectAnswers(iraToolContentId);
-	} else if (isIraAssesmentAvailable) {
+	if (isIraAvailable) {
 	    iraCorrectAnswerCountByUser = commonAssessmentService.countCorrectAnswers(iraToolContentId);
 	}
 
@@ -511,15 +504,11 @@
 		Long toolActivityId = toolActivity.getActivityId();
 		String toolTitle = toolActivity.getTitle();
 
-		//count only the first MCQ or Assessmnet as iRA
-		if (!iraPassed && (CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)
-			|| isScratchieAvailable && CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature))) {
+		//count only the first Assessmnet as iRA
+		if (!iraPassed && isScratchieAvailable
+			&& CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) {
 		    iraPassed = true;
-		    if (CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)) {
-			request.setAttribute("isIraMcqAvailable", true);
-		    } else {
-			request.setAttribute("isIraAssessmentAvailable", true);
-		    }
+		    request.setAttribute("isIraAssessmentAvailable", true);
 		    request.setAttribute("iraToolContentId", toolContentId);
 		    request.setAttribute("iraToolActivityId", toolActivityId);
 
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -rdb0095c7ccb1a6c3bdbce14f3ca019ac106bc1e5
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision db0095c7ccb1a6c3bdbce14f3ca019ac106bc1e5)
@@ -295,7 +295,7 @@
 						</label>
 					</div>
 					
-					<c:if test="${not empty isIraAssessmentAvailable}">
+					<c:if test="${not empty isIraAvailable}">
 						<div class="navigate-btn-container">
 							<a id="load-irat-tab-btn" class="btn btn-primary" href="#"
 							   data-tab-name="iratStudentChoices"	title="<fmt:message key='label.ira' />">
Index: lams_monitoring/web/tblmonitor/teams.jsp
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -rdb0095c7ccb1a6c3bdbce14f3ca019ac106bc1e5
--- lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_monitoring/web/tblmonitor/teams.jsp	(.../teams.jsp)	(revision db0095c7ccb1a6c3bdbce14f3ca019ac106bc1e5)
@@ -164,10 +164,8 @@
 			$('#ira-correct-answer-count').html(userScore);
 
 			//load modal dialog content using Ajax
-			var url = "${isIraMcqAvailable}" == "true" ? "<lams:LAMSURL/>tool/lamc11/tblmonitoring/getModalDialogForTeamsTab.do" 
-													   : "<lams:LAMSURL/>tool/laasse10/tblmonitoring/getModalDialogForTeamsTab.do";
 			$('#ira-modal .modal-body').load(
-				url, 
+				"<lams:LAMSURL/>tool/laasse10/tblmonitoring/getModalDialogForTeamsTab.do", 
 				{
 					toolContentID: "${iraToolContentId}",
 					userID: userId
@@ -277,7 +275,7 @@
 										<fmt:message key="label.teams"/>
 									</th>
 									
-									<c:if test="${isIraAssessmentAvailable || isIraMcqAvailable}">
+									<c:if test="${isIraAvailable}">
 										<th class="text-center">
 											<fmt:message key="label.ira.correct.count.average"/>
 										</th>
@@ -288,7 +286,7 @@
 											<fmt:message key="label.tra.correct.count"/>
 										</th>
 										
-										<c:if test="${isIraAssessmentAvailable || isIraMcqAvailable}">
+										<c:if test="${isIraAvailable}">
 											<th class="text-center">
 												<fmt:message key="label.ira.tra.delta"/>
 											</th>
@@ -305,7 +303,7 @@
 											<a href="#teams-panel-${groupDto.groupID}"><c:out value="${groupDto.groupName}" /></a>
 										</td>
 										
-										<c:if test="${isIraAssessmentAvailable || isIraMcqAvailable}">
+										<c:if test="${isIraAvailable}">
 											<td class="text-center">
 												<c:choose>
 													<c:when test="${empty groupDto.iraCorrectAnswerCountAverage}">
@@ -353,7 +351,7 @@
 												</c:choose>
 											</td>
 											
-											<c:if test="${isIraAssessmentAvailable || isIraMcqAvailable}">
+											<c:if test="${isIraAvailable}">
 												<td class="text-center">
 													<c:choose>
 														<c:when test="${empty groupDto.correctAnswerCountPercentDelta}">
@@ -385,7 +383,7 @@
 									<tr>
 										<th><fmt:message key="label.ira.tra.average"/></th>
 										
-										<c:if test="${isIraAssessmentAvailable || isIraMcqAvailable}">
+										<c:if test="${isIraAvailable}">
 											<td class="text-center">
 												<c:choose>
 													<c:when test="${empty averageIraCorrectAnswerCountAverage}">
@@ -410,7 +408,7 @@
 												</c:choose>
 											</td>
 											
-											<c:if test="${isIraAssessmentAvailable || isIraMcqAvailable}">
+											<c:if test="${isIraAvailable}">
 												<td class="text-center">
 													<c:choose>
 														<c:when test="${empty averageCorrectAnswerCountDelta}">
@@ -461,7 +459,7 @@
 								</c:choose>
 							</c:if>
 							
-							<c:if test="${isIraAssessmentAvailable || isIraMcqAvailable}">
+							<c:if test="${isIraAvailable}">
 								<div class="table-responsive">
 									<table class="table table-hover table-condensed">
 										<thead>
@@ -594,7 +592,7 @@
 							<!-- Change leader and Compare buttons -->
 							<div class="row">
 								<div class="col-xs-12 col-md-12 col-lg-12">
-									<c:if test="${(isIraAssessmentAvailable || isIraMcqAvailable) && isScratchieAvailable && not empty groupDto.userList && not empty groupDto.traCorrectAnswerCount}">
+									<c:if test="${(isIraAvailable) && isScratchieAvailable && not empty groupDto.userList && not empty groupDto.traCorrectAnswerCount}">
 										<button href="#" data-bs-toggle="modal" data-bs-target="#comparison-modal" type="button" class="btn btn-sm btn-secondary float-end"
 												data-ira-scores="
 												<c:forEach var="userDto" items="${groupDto.userList}">