diff --git a/rapids/views.py b/rapids/views.py
index a69b03a8..bd5e6a08 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -749,12 +749,12 @@ def exam_scores_cid_user(request, pk, cid, passcode):
 
     questions = exam.exam_questions.all()#.prefetch_related("cid_user_answers", "answers")
 
-    cid_user_answers = list(CidUserAnswer.objects.filter(cid=cid, exam__id=pk).prefetch_related("question"))
+    #cid_user_answers = list(CidUserAnswer.objects.filter(cid=cid, exam__id=pk).prefetch_related("question"))
 
-    cid_user_answers_q_map = {}
+    #cid_user_answers_q_map = {}
 
-    for ans in cid_user_answers:
-        cid_user_answers_q_map[ans.question] = ans
+    #for ans in cid_user_answers:
+    #    cid_user_answers_q_map[ans.question] = ans
 
     answers_and_marks = []
     answers_marks = []
@@ -766,8 +766,8 @@ def exam_scores_cid_user(request, pk, cid, passcode):
 
     for q in questions:
         # Get user answer
-        #user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
-        user_answer = cid_user_answers_q_map[q]
+        user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
+        #user_answer = cid_user_answers_q_map[q]
 
         if not user_answer or user_answer is None:
             # skip if no answer