diff --git a/bloclink/apps/bis/views.py b/bloclink/apps/bis/views.py
index ec583c5973bfcf971370040b4f68edd5fdcfb126..737dc82e3ba842b9039ba29c0287ca74c200f777 100644
--- a/bloclink/apps/bis/views.py
+++ b/bloclink/apps/bis/views.py
@@ -1,22 +1,14 @@
 import json
 import os
 from datetime import datetime
-import base64
 from django.conf import settings
-from django.http import HttpResponse, JsonResponse
+from django.http import JsonResponse
 from django.shortcuts import render
 from django.views import View
 from .models import  Questions, MapBoxBuilding, Answers, SubmittedSurvey, Users, Surveys, SurveyAreas, RecommendationSetMap, Ecm, Report
 from django.forms.models import model_to_dict
-import smtplib
-from django.core.mail import send_mail
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-from django.template.loader import get_template
-from django.template import Context
 from django.template.loader import render_to_string
 from django.core.mail import EmailMessage
-from django.db import connections
 import re
 import boto3
 from bpeng.bis.report import generate_pns_report
@@ -324,9 +316,7 @@ class SubmitQuestionnaire(View):
             'address': buildingAddress,
             'questions': {},
         }
-        comfortIssue = []
         submitAnswers = SubmittedSurvey.objects.using('bis').filter(user_id=put['userId']).order_by('id')
-
         for submitAnswer in submitAnswers:
             question = Questions.objects.using('bis').filter(id = model_to_dict(submitAnswer)['question_id'])[0].question
             answer = Answers.objects.using('bis').filter(id = model_to_dict(submitAnswer)['answer_id'])[0].answer
@@ -343,16 +333,20 @@ class SubmitQuestionnaire(View):
                                                                 'address': buildingData['address'],
                                                                 'QA': buildingData['questions']})
 
+        oakland_survey = 2
+        milwaukee_survey = 3
         subject = 'BIS - ' + buildingData['address']
         if os.environ['ENVIRONMENT'] == 'prod':
             msg = EmailMessage(subject, msg_html, from_email, [settings.PROD_EMAIL])
             msg.content_subtype = "html"
-            msg.attach_file(dest_ppt_file)
+            if put['surveyId'] in [oakland_survey, milwaukee_survey]:
+                msg.attach_file(dest_ppt_file)
             msg.send() 
         else:
             msg = EmailMessage("TEST - " + subject, msg_html, from_email, [settings.TEST_EMAIL])
             msg.content_subtype = "html"
-            msg.attach_file(dest_ppt_file)
+            if put['surveyId'] in [oakland_survey, milwaukee_survey]:
+                msg.attach_file(dest_ppt_file)
             msg.send()
 
         return JsonResponse({