diff --git a/app/models/district.rb b/app/models/district.rb
index a72325fa..896fe5b8 100644
--- a/app/models/district.rb
+++ b/app/models/district.rb
@@ -15,5 +15,7 @@ class District < ApplicationRecord
     self.slug ||= name.parameterize
   end
 
-  scope :boston, -> { where(name: 'Boston') }
+  def self.boston
+    @@boston ||= District.find_by_name('Boston')
+  end
 end
diff --git a/app/models/survey_item.rb b/app/models/survey_item.rb
index dafded58..9660ad25 100644
--- a/app/models/survey_item.rb
+++ b/app/models/survey_item.rb
@@ -1,14 +1,5 @@
 # frozen_string_literal: true
 
-# SurveyItem.includes(%i[scale measure subcategory]).where("scale.measure.subcategory": subcategory).first.subcategory
-# SurveyItem.survey_items_for_grade_and_subcategory(school, academic_year, 0, subcategory)
-# SurveyItem.includes(:survey_item_responses)
-#        .includes(:subcategory)
-#        .where("survey_item_responses.grade": grade,
-#               "survey_item_responses.school": school,
-#               "survey_item_responses.academic_year": academic_year,
-#               survey_item_id: subcategory.survey_items.pluck(:survey_item_id
-#               )).count
 class SurveyItem < ActiveRecord::Base
   belongs_to :scale, counter_cache: true
   has_one :measure, through: :scale
@@ -59,7 +50,7 @@ class SurveyItem < ActiveRecord::Base
   }
 
   scope :survey_type_for_grade, lambda { |school, academic_year, grade|
-    survey_items_set_by_grade = survey_items_for_grade(school, academic_year, grade).to_set
+    survey_items_set_by_grade = survey_items_for_grade(school, academic_year, grade).pluck(:survey_item_id).to_set
     if survey_items_set_by_grade.size > 0 && survey_items_set_by_grade.subset?(early_education_surveys.pluck(:survey_item_id).to_set)
       return :early_education
     end
@@ -67,7 +58,7 @@ class SurveyItem < ActiveRecord::Base
     :regular
   }
 
-  # Do I need this?
+  # TODO: rename this to Summary
   def description
     DataAvailability.new(survey_item_id, prompt, true)
   end