diff --git a/app/services/cleaner.rb b/app/services/cleaner.rb
index dbf1829b..78645399 100644
--- a/app/services/cleaner.rb
+++ b/app/services/cleaner.rb
@@ -76,7 +76,7 @@ class Cleaner
 
     file.lazy.each_slice(1000) do |lines|
       CSV.parse(lines.join, headers:).map do |row|
-        values = SurveyItemValues.new(row:, headers:, genders:,
+        values = SurveyItemValues.new(row:, headers:,
                                       survey_items: all_survey_items, schools:)
         next unless values.valid_school?
 
diff --git a/app/services/survey_item_values.rb b/app/services/survey_item_values.rb
index 7669aff0..435097c3 100644
--- a/app/services/survey_item_values.rb
+++ b/app/services/survey_item_values.rb
@@ -1,12 +1,11 @@
 class SurveyItemValues
-  attr_reader :row, :headers, :genders, :survey_items, :schools
+  attr_reader :row, :headers,  :survey_items, :schools
 
-  def initialize(row:, headers:, genders:, survey_items:, schools:)
+  def initialize(row:, headers:, survey_items:, schools:)
     @row = row
     # Remove any newlines in headers
     headers = headers.map { |item| item.delete("\n") if item.present? }
     @headers = include_all_headers(headers:)
-    @genders = genders
     @survey_items = survey_items
     @schools = schools
 
@@ -18,6 +17,8 @@ class SurveyItemValues
     row["Raw SpEd"] = raw_sped
     row["SpEd"] = sped
     row["Progress Count"] = progress
+    row["Race"] ||= races.map { |race| race&.qualtrics_code }.join(",")
+    row["Gender"] ||= gender
 
     copy_data_to_main_column(main: /Race/i, secondary: /Race Secondary|Race-1/i)
     copy_data_to_main_column(main: /Gender/i, secondary: /Gender Secondary|Gender-1/i)
@@ -124,8 +125,7 @@ class SurveyItemValues
       gender_code ||= value_from(pattern: /Gender-\s*Qcode/i)
       gender_code ||= value_from(pattern: /Gender - do not use/i)
       gender_code ||= value_from(pattern: /Gender/i)
-      gender_code = Gender.qualtrics_code_from(gender_code)
-      genders[gender_code] if genders
+      Gender.qualtrics_code_from(gender_code)
     end
   end
 
diff --git a/app/services/survey_responses_data_loader.rb b/app/services/survey_responses_data_loader.rb
index 7020e3be..e1667b80 100644
--- a/app/services/survey_responses_data_loader.rb
+++ b/app/services/survey_responses_data_loader.rb
@@ -9,7 +9,7 @@ class SurveyResponsesDataLoader
 
       file.lazy.each_slice(500) do |lines|
         survey_item_responses = CSV.parse(lines.join, headers:).map do |row|
-          process_row(row: SurveyItemValues.new(row:, headers: headers_array, genders:, survey_items: all_survey_items, schools:),
+          process_row(row: SurveyItemValues.new(row:, headers: headers_array,  survey_items: all_survey_items, schools:),
                       rules:)
         end
         SurveyItemResponse.import survey_item_responses.compact.flatten, batch_size: 500
@@ -29,7 +29,7 @@ class SurveyResponsesDataLoader
       next unless line.present?
 
       CSV.parse(line, headers:).map do |row|
-        survey_item_responses << process_row(row: SurveyItemValues.new(row:, headers: headers_array, genders:, survey_items: all_survey_items, schools:),
+        survey_item_responses << process_row(row: SurveyItemValues.new(row:, headers: headers_array,  survey_items: all_survey_items, schools:),
                                              rules:)
       end
 
@@ -90,8 +90,8 @@ class SurveyResponsesDataLoader
     end.compact
   end
 
-  def create_or_update_response(survey_item_response:, likert_score:, row:, survey_item:)
-    gender = row.gender
+  def create_or_update_response(survey_item_response:, likert_score:, row:, survey_item:, student:)
+    gender = genders[row.gender]
     grade = row.grade
     income = incomes[row.income.parameterize]
     ell = ells[row.ell]
diff --git a/spec/services/cleaner_spec.rb b/spec/services/cleaner_spec.rb
index b2306eb7..bc74fe86 100644
--- a/spec/services/cleaner_spec.rb
+++ b/spec/services/cleaner_spec.rb
@@ -151,7 +151,7 @@ RSpec.describe Cleaner do
         it "adds the survey type as standard to the filename" do
           survey_items = SurveyItem.where(survey_item_id: standard_survey_items)
 
-          data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: standard_survey_items, genders: nil, survey_items:,
+          data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: standard_survey_items,  survey_items:,
                                        schools: School.school_hash)]
           filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
             headers: standard_survey_items, data:, filepath: nil
@@ -163,7 +163,7 @@ RSpec.describe Cleaner do
           it "adds the survey type as short form to the filename" do
             survey_items = SurveyItem.where(survey_item_id: short_form_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: short_form_survey_items, genders: nil, survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: short_form_survey_items,  survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: short_form_survey_items, data:, filepath: nil
@@ -176,7 +176,7 @@ RSpec.describe Cleaner do
           it "adds the survey type as early education to the filename" do
             survey_items = SurveyItem.where(survey_item_id: early_education_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items, genders: nil, survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items,  survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: early_education_survey_items, data:, filepath: nil
@@ -188,7 +188,7 @@ RSpec.describe Cleaner do
           it "adds the survey type as teacher to the filename" do
             survey_items = SurveyItem.where(survey_item_id: teacher_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: teacher_survey_items, genders: nil, survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: teacher_survey_items,  survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: teacher_survey_items, data:, filepath: nil
@@ -201,9 +201,9 @@ RSpec.describe Cleaner do
           it "adds all districts to the filename" do
             survey_items = SurveyItem.where(survey_item_id: teacher_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: teacher_survey_items, genders: nil, survey_items:, schools: School.school_hash),
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: teacher_survey_items,  survey_items:, schools: School.school_hash),
                     SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "222_222" },
-                                         headers: teacher_survey_items, genders: nil, survey_items:, schools: School.school_hash)]
+                                         headers: teacher_survey_items,  survey_items:, schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: teacher_survey_items, data:, filepath: nil
             )
@@ -215,7 +215,7 @@ RSpec.describe Cleaner do
           it "adds the part to the filename" do
             survey_items = SurveyItem.where(survey_item_id: early_education_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items, genders: nil, survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items,  survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: early_education_survey_items, data:, filepath: "/data/survey_responses/maynard early ed_ form a.2022-23.csv"
@@ -227,7 +227,7 @@ RSpec.describe Cleaner do
           it "adds the part to the filename" do
             survey_items = SurveyItem.where(survey_item_id: early_education_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items, genders: nil, survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items,  survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: early_education_survey_items, data:, filepath: "/data/survey_responses/maynard early ed_ form f.2022-23.csv"
@@ -239,7 +239,7 @@ RSpec.describe Cleaner do
           it "adds the part to the filename" do
             survey_items = SurveyItem.where(survey_item_id: early_education_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items, genders: nil, survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items,  survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: early_education_survey_items, data:, filepath: "/data/survey_responses/maynard early ed_ form_f.2022-23.csv"
@@ -251,7 +251,7 @@ RSpec.describe Cleaner do
           it "adds the part to the filename" do
             survey_items = SurveyItem.where(survey_item_id: early_education_survey_items)
 
-            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items, genders: nil, survey_items:,
+            data = [SurveyItemValues.new(row: { "Recorded Date" => recorded_date, "Dese ID" => "1_740_505" }, headers: early_education_survey_items,  survey_items:,
                                          schools: School.school_hash)]
             filename = Cleaner.new(input_filepath:, output_filepath:, log_filepath:).filename(
               headers: early_education_survey_items, data:, filepath: "/data/survey_responses/maynard early ed_ form&f.2022-23.csv"
diff --git a/spec/services/survey_item_values_spec.rb b/spec/services/survey_item_values_spec.rb
index 695c6ad4..1547b034 100644
--- a/spec/services/survey_item_values_spec.rb
+++ b/spec/services/survey_item_values_spec.rb
@@ -105,12 +105,12 @@ RSpec.describe SurveyItemValues, type: :model do
   context ".recorded_date" do
     it "returns the recorded date" do
       row = { "RecordedDate" => "2017-01-01" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.recorded_date).to eq Date.parse("2017-01-01")
 
       headers = ["Recorded Date"]
       row = { "Recorded Date" => "2017-01-02" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.recorded_date).to eq Date.parse("2017-01-02")
     end
   end
@@ -120,11 +120,11 @@ RSpec.describe SurveyItemValues, type: :model do
       attleboro
       headers = ["DeseID"]
       row = { "DeseID" => "1234" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.school).to eq attleboro
 
       row = { "DeseID" => "1234" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.school).to eq attleboro
     end
   end
@@ -132,7 +132,7 @@ RSpec.describe SurveyItemValues, type: :model do
   context ".grade" do
     it "returns the grade that maps to the grade provided" do
       row = { "Grade" => "1" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.grade).to eq 1
     end
   end
@@ -141,76 +141,76 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the gender is female" do
       it "returns the gender that maps to the gender provided" do
         row = { "Gender" => "1" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 1
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 1
 
         row = { "Gender" => "Female" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 1
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 1
 
         row = { "Gender" => "F" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 1
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 1
       end
     end
 
     context "when the gender is male" do
       it "returns the gender that maps to the gender provided" do
         row = { "Gender" => "2" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 2
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 2
 
         row = { "Gender" => "Male" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 2
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 2
 
         row = { "Gender" => "M" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 2
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 2
       end
     end
 
     context "when the gender is non-binary" do
       it "returns the gender that maps to the gender provided" do
         row = { "Gender" => "4" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 4
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 4
 
         row = { "Gender" => "N - Non-Binary" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 4
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 4
 
         row = { "Gender" => "N" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 4
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 4
       end
     end
 
     context "when the gender is not known" do
       it "returns the gender that maps to the gender provided" do
         row = { "Gender" => "N/A" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 99
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 99
 
         row = { "Gender" => "NA" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 99
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 99
 
         row = { "Gender" => "#N/A" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 99
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 99
 
         row = { "Gender" => "#NA" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 99
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 99
 
         row = { "Gender" => "Prefer not to disclose" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 99
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 99
 
         row = { "Gender" => "" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
-        expect(values.gender.qualtrics_code).to eq 99
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
+        expect(values.gender).to eq 99
       end
     end
   end
@@ -223,15 +223,15 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the race is Native American" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "1" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [1]
 
         row = { "Race" => "Native American" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [1]
 
         row = { "Race" => "American Indian or Alaskan Native" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [1]
       end
     end
@@ -239,19 +239,19 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the race is Asian" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "2" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [2]
 
         row = { "Race" => "Asian" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [2]
 
         row = { "Race" => "Pacific Islander" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [2]
 
         row = { "Race" => "Pacific Island or Hawaiian Native" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [2]
       end
     end
@@ -259,15 +259,15 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the race is Black" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "3" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [3]
 
         row = { "Race" => "Black" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [3]
 
         row = { "Race" => "African American" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [3]
       end
     end
@@ -275,15 +275,15 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the race is Hispanic" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "4" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [4]
 
         row = { "Race" => "Hispanic" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [4]
 
         row = { "Race" => "Latinx" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [4]
       end
     end
@@ -291,15 +291,15 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the race is White" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "5" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [5]
 
         row = { "Race" => "White" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [5]
 
         row = { "Race" => "Caucasian" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [5]
       end
     end
@@ -307,11 +307,11 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the race is not disclosed" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "6" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
 
         row = { "Race" => "Prefer not to disclose" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
       end
     end
@@ -319,11 +319,11 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the race is not disclosed" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "6" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
 
         row = { "Race" => "Prefer not to disclose" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
       end
     end
@@ -331,11 +331,11 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the race is self described" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "7" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
 
         row = { "Race" => "Prefer to self-describe" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
       end
     end
@@ -343,15 +343,15 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the race is Middle Eastern" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "8" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [8]
 
         row = { "Race" => "Middle Eastern" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [8]
 
         row = { "Race" => "North African" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [8]
       end
     end
@@ -359,23 +359,23 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the race is unknown" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "NA" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
 
         row = { "Race" => "#N/A" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
 
         row = { "Race" => "n/a" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
 
         row = { "Race" => "#na" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
 
         row = { "Race" => "" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [99]
       end
     end
@@ -383,42 +383,42 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when there are multiple races" do
       it "returns the gender that maps to the gender provided" do
         row = { "Race" => "1,2,3" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [1, 2, 3, 100]
 
         row = { "Race" => "Alaskan Native, Pacific Islander, Black" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [1, 2, 3, 100]
 
         row = { "Race" => "American Indian or Alaskan Native, Asian, African American" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [1, 2, 3, 100]
         row = { "Race" => "n/a" }
 
         row = { "Race" => "American Indian or Alaskan Native, Asian and African American" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [1, 2, 3, 100]
 
         row = { "Race" => "American Indian or Alaskan Native and Asian and African American" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [1, 2, 3, 100]
 
         row = { "Race" => "American Indian or Alaskan Native and Asian, and African American" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [1, 2, 3, 100]
 
         row = { "Race" => "Asian, Caucasian and African American" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [2, 5, 3, 100]
 
         row = { "Race" => "Caucasian and Asian and African American" }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [5, 2, 3, 100]
 
         row = { "Race- SIS" => "Caucasian and Asian and African American", "HispanicLatino" => "true" }
         headers.push("HispanicLatino")
         headers.push("Race- SIS")
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
         expect(values.races.map { |race| race&.qualtrics_code }).to eq [5, 2, 3, 4, 100]
       end
     end
@@ -427,11 +427,11 @@ RSpec.describe SurveyItemValues, type: :model do
   context ".respondent_type" do
     it "reads header to find the survey type" do
       headers = %w[s-sbel-q5 s-phys-q2 RecordedDate]
-      values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row: {}, headers:,  survey_items:, schools:)
       expect(values.respondent_type).to eq :student
 
       headers = %w[t-sbel-q5 t-phys-q2]
-      values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row: {}, headers:,  survey_items:, schools:)
       expect(values.respondent_type).to eq :teacher
     end
   end
@@ -440,14 +440,14 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when survey type is standard form" do
       it "returns the survey type" do
         headers = standard_survey_items
-        values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row: {}, headers:,  survey_items:, schools:)
         expect(values.survey_type).to eq :standard
       end
     end
     context "when survey type is teacher form" do
       it "returns the survey type" do
         headers = teacher_survey_items
-        values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row: {}, headers:,  survey_items:, schools:)
         expect(values.survey_type).to eq :teacher
       end
     end
@@ -455,7 +455,7 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when survey type is short form" do
       it "returns the survey type" do
         headers = short_form_survey_items
-        values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row: {}, headers:,  survey_items:, schools:)
         expect(values.survey_type).to eq :short_form
       end
     end
@@ -463,7 +463,7 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when survey type is early education" do
       it "returns the survey type" do
         headers = early_education_survey_items
-        values = SurveyItemValues.new(row: {}, headers:, genders:, survey_items:, schools:)
+        values = SurveyItemValues.new(row: {}, headers:,  survey_items:, schools:)
         expect(values.survey_type).to eq :early_education
       end
     end
@@ -478,14 +478,14 @@ RSpec.describe SurveyItemValues, type: :model do
     it "translates Free Lunch to Economically Disadvantaged - Y" do
       headers = ["LowIncome"]
       row = { "LowIncome" => "Free Lunch" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.income).to eq "Economically Disadvantaged - Y"
     end
 
     it "translates Reduced Lunch to Economically Disadvantaged - Y" do
       headers = ["LowIncome"]
       row = { "LowIncome" => "Reduced Lunch" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.income).to eq "Economically Disadvantaged - Y"
     end
 
@@ -493,14 +493,14 @@ RSpec.describe SurveyItemValues, type: :model do
       headers = ["LowIncome"]
       row = { "LowIncome" => "LowIncome" }
 
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.income).to eq "Economically Disadvantaged - Y"
     end
 
     it "translates Not Eligible to Economically Disadvantaged - N" do
       headers = ["LowIncome"]
       row = { "LowIncome" => "Not Eligible" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.income).to eq "Economically Disadvantaged - N"
     end
 
@@ -508,7 +508,7 @@ RSpec.describe SurveyItemValues, type: :model do
       headers = ["LowIncome"]
       row = { "LowIncome" => "" }
 
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.income).to eq "Unknown"
     end
   end
@@ -522,37 +522,37 @@ RSpec.describe SurveyItemValues, type: :model do
     it 'translates "LEP Student 1st Year" or "LEP Student Not 1st Year" into ELL' do
       headers = ["Raw ELL"]
       row = { "Raw ELL" => "LEP Student 1st Year" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.ell).to eq "ELL"
 
       row = { "Raw ELL" => "LEP Student Not 1st Year" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.ell).to eq "ELL"
 
       row = { "Raw ELL" => "LEP Student Not 1st Year" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.ell).to eq "ELL"
     end
 
     it 'translates "Does not Apply" into "Not ELL"' do
       headers = ["Raw ELL"]
       row = { "Raw ELL" => "Does not apply" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.ell).to eq "Not ELL"
 
       row = { "Raw ELL" => "Does Not APPLY" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.ell).to eq "Not ELL"
     end
 
     it 'tranlsates blanks into "Unknown"' do
       headers = ["Raw ELL"]
       row = { "Raw ELL" => "" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.ell).to eq "Unknown"
 
       row = { "Raw ELL" => "Anything else" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.ell).to eq "Unknown"
     end
   end
@@ -566,31 +566,31 @@ RSpec.describe SurveyItemValues, type: :model do
     it 'translates "active" into "Special Education"' do
       headers = ["Raw SpEd"]
       row = { "Raw SpEd" => "active" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.sped).to eq "Special Education"
     end
 
     it 'translates "exited" into "Not Special Education"' do
       headers = ["Raw SpEd"]
       row = { "Raw SpEd" => "exited" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.sped).to eq "Not Special Education"
     end
     it 'translates blanks into "Not Special Education' do
       headers = ["Raw SpEd"]
       row = { "Raw SpEd" => "" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.sped).to eq "Not Special Education"
     end
 
     it 'tranlsates NA into "Not Special Education"' do
       headers = ["Raw SpEd"]
       row = { "Raw SpEd" => "NA" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.sped).to eq "Not Special Education"
 
       row = { "Raw SpEd" => "#NA" }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.sped).to eq "Not Special Education"
     end
   end
@@ -599,33 +599,33 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when duration is valid" do
       it "returns true" do
         headers = standard_survey_items
-        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "240", "Gender" => "Male" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "240", "Gender" => "Male" }, headers:,  survey_items:,
                                       schools:)
         expect(values.valid_duration?).to eq true
 
         headers = teacher_survey_items
-        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "300" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "300" }, headers:,  survey_items:,
                                       schools:)
         expect(values.valid_duration?).to eq true
 
         headers = short_form_survey_items
-        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "100" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "100" }, headers:,  survey_items:,
                                       schools:)
         expect(values.valid_duration?).to eq true
 
         # When duration is blank or N/A or NA, we don't have enough information to kick out the row as invalid so we keep it in
         headers = short_form_survey_items
-        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "" }, headers:,  survey_items:,
                                       schools:)
         expect(values.valid_duration?).to eq true
 
         headers = short_form_survey_items
-        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "N/A" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "N/A" }, headers:,  survey_items:,
                                       schools:)
         expect(values.valid_duration?).to eq true
 
         headers = short_form_survey_items
-        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "NA" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "NA" }, headers:,  survey_items:,
                                       schools:)
         expect(values.valid_duration?).to eq true
       end
@@ -634,16 +634,16 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when duration is invalid" do
       it "returns false" do
         headers = standard_survey_items
-        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "239" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "239" }, headers:,  survey_items:,
                                       schools:)
         expect(values.valid_duration?).to eq false
 
         headers = teacher_survey_items
-        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "299" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "299" }, headers:,  survey_items:,
                                       schools:)
         expect(values.valid_duration?).to eq false
         headers = short_form_survey_items
-        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "99" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "Duration (in seconds)" => "99" }, headers:,  survey_items:,
                                       schools:)
         expect(values.valid_duration?).to eq false
       end
@@ -656,7 +656,7 @@ RSpec.describe SurveyItemValues, type: :model do
       row = { "s-peff-q1" => 1, "s-peff-q2" => 1, "s-peff-q3" => 1, "s-peff-q4" => 1,
               "s-peff-q5" => 1, "s-peff-q6" => 1, "s-phys-q1" => 1, "s-phys-q2" => 1,
               "s-phys-q3" => 1, "s-phys-q4" => 1 }
-      values = SurveyItemValues.new(row:, headers:, genders:, survey_items:, schools:)
+      values = SurveyItemValues.new(row:, headers:,  survey_items:, schools:)
       expect(values.progress).to eq 10
     end
   end
@@ -670,7 +670,7 @@ RSpec.describe SurveyItemValues, type: :model do
                 "s-phys-q3" => 1, "s-phys-q4" => 1, "s-emsa-q1" => 1, "s-emsa-q2" => 1,
                 "s-emsa-q3" => 1, "s-sbel-q1" => 1, "s-sbel-q2" => 1, "s-sbel-q3" => 1,
                 "s-sbel-q4" => 1 }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row:, headers:,  survey_items:,
                                       schools:)
         expect(values.progress).to eq 17
         expect(values.valid_progress?).to eq true
@@ -685,7 +685,7 @@ RSpec.describe SurveyItemValues, type: :model do
           "t-coll-q3" => 1, "t-qupd-q1" => 1, "t-qupd-q2" => 1, "t-qupd-q3" => 1,
           "t-psup-q3" => 1, "t-psup-q4" => 1, "t-acch-q1" => 1, "t-acch-q2" => 1
         }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row:, headers:,  survey_items:,
                                       schools:)
         expect(values.progress).to eq 12
         expect(values.valid_progress?).to eq true
@@ -695,7 +695,7 @@ RSpec.describe SurveyItemValues, type: :model do
         headers = short_form_survey_items
         row = { "s-peff-q1" => 1, "s-peff-q2" => 1, "s-peff-q3" => 1, "s-peff-q4" => 1,
                 "s-sbel-q4" => 1 }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row:, headers:,  survey_items:,
                                       schools:)
         expect(values.progress).to eq 5
         expect(values.valid_progress?).to eq true
@@ -705,7 +705,7 @@ RSpec.describe SurveyItemValues, type: :model do
         headers = early_education_survey_items
         row = { "s-peff-es1" => 1, "s-peff-es2" => 1, "s-peff-es3" => 1, "s-peff-es4" => 1,
                 "s-peff-es5" => 1 }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row:, headers:,  survey_items:,
                                       schools:)
         expect(values.progress).to eq 5
         expect(values.valid_progress?).to eq true
@@ -718,7 +718,7 @@ RSpec.describe SurveyItemValues, type: :model do
         row = { "s-peff-q1" => 1, "s-peff-q2" => 1, "s-peff-q3" => 1, "s-peff-q4" => 1,
                 "s-peff-q5" => 1, "s-peff-q6" => 1, "s-phys-q1" => 1, "s-phys-q2" => 1,
                 "s-emsa-q3" => 1, "s-sbel-q1" => 1 }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row:, headers:,  survey_items:,
                                       schools:)
         expect(values.progress).to eq 10
         expect(values.valid_progress?).to eq false
@@ -733,7 +733,7 @@ RSpec.describe SurveyItemValues, type: :model do
           "t-coll-q3" => 1, "t-qupd-q1" => 1, "t-qupd-q2" => 1, "t-qupd-q3" => 1,
           "t-psup-q3" => 1, "t-psup-q4" => 1, "t-acch-q1" => 1
         }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row:, headers:,  survey_items:,
                                       schools:)
         expect(values.progress).to eq 11
         expect(values.valid_progress?).to eq false
@@ -742,7 +742,7 @@ RSpec.describe SurveyItemValues, type: :model do
       it "when there are fewer than 5 short form survey items valid_progress returns true" do
         headers = short_form_survey_items
         row = { "s-peff-q1" => 1, "s-peff-q2" => 1, "s-peff-q3" => 1, "s-peff-q4" => 1 }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row:, headers:,  survey_items:,
                                       schools:)
         expect(values.progress).to eq 4
         expect(values.valid_progress?).to eq false
@@ -751,7 +751,7 @@ RSpec.describe SurveyItemValues, type: :model do
       it "when there are fewer than 5 early education survey items valid_progress returns true" do
         headers = early_education_survey_items
         row = { "s-peff-es1" => 1, "s-peff-es2" => 1, "s-peff-es3" => 1, "s-peff-es4" => 1 }
-        values = SurveyItemValues.new(row:, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row:, headers:,  survey_items:,
                                       schools:)
         expect(values.progress).to eq 4
         expect(values.valid_progress?).to eq false
@@ -767,14 +767,14 @@ RSpec.describe SurveyItemValues, type: :model do
       end
       it "returns true for students" do
         headers = %w[s-sbel-q5 s-phys-q2 grade RecordedDate DeseID]
-        values = SurveyItemValues.new(row: { "grade" => "9", "RecordedDate" => recorded_date, "DeseID" => "1234" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "grade" => "9", "RecordedDate" => recorded_date, "DeseID" => "1234" }, headers:,  survey_items:,
                                       schools:)
 
         expect(values.valid_grade?).to eq true
       end
       it "returns true for teachers" do
         headers = %w[t-sbel-q5 t-phys-q2 grade RecordedDate DeseID]
-        values = SurveyItemValues.new(row: { "RecordedDate" => recorded_date, "DeseID" => "1234" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "RecordedDate" => recorded_date, "DeseID" => "1234" }, headers:,  survey_items:,
                                       schools:)
         expect(values.valid_grade?).to eq true
       end
@@ -787,7 +787,7 @@ RSpec.describe SurveyItemValues, type: :model do
       end
       it "returns false" do
         headers = %w[s-sbel-q5 s-phys-q2 grade RecordedDate DeseID]
-        values = SurveyItemValues.new(row: { "grade" => "2", "RecordedDate" => recorded_date, "DeseID" => "1234" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "grade" => "2", "RecordedDate" => recorded_date, "DeseID" => "1234" }, headers:,  survey_items:,
                                       schools: School.school_hash)
         expect(values.valid_grade?).to eq false
       end
@@ -798,13 +798,13 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the standard deviation is valid" do
       it "returns true for student questions" do
         headers = %w[s-sbel-q5 s-phys-q1 s-phys-q2 RecordedDate]
-        values = SurveyItemValues.new(row: { "RecordedDate" => recorded_date, "Dese ID" => "1234", "s-sbel-q5" => "1", "s-phys-q1" => "", "s-phys-q2" => "5" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "RecordedDate" => recorded_date, "Dese ID" => "1234", "s-sbel-q5" => "1", "s-phys-q1" => "", "s-phys-q2" => "5" }, headers:,  survey_items:,
                                       schools: School.school_hash)
         expect(values.valid_sd?).to eq true
       end
       it "returns true for teacher questions" do
         headers = %w[t-sbel-q5 t-phys-q2]
-        values = SurveyItemValues.new(row: { "RecordedDate" => recorded_date, "Dese ID" => "1234", "t-sbel-q5" => "1", "t-phys-q2" => "5" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "RecordedDate" => recorded_date, "Dese ID" => "1234", "t-sbel-q5" => "1", "t-phys-q2" => "5" }, headers:,  survey_items:,
                                       schools: School.school_hash)
         expect(values.valid_sd?).to eq true
       end
@@ -813,13 +813,13 @@ RSpec.describe SurveyItemValues, type: :model do
     context "when the standard deviation is invalid" do
       it "returns false for student questions" do
         headers = %w[s-sbel-q5 s-phys-q1 s-phys-q2 RecordedDate]
-        values = SurveyItemValues.new(row: { "RecordedDate" => recorded_date, "Dese ID" => "1234", "s-sbel-q5" => "1", "s-phys-q2" => "1" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "RecordedDate" => recorded_date, "Dese ID" => "1234", "s-sbel-q5" => "1", "s-phys-q2" => "1" }, headers:,  survey_items:,
                                       schools: School.school_hash)
         expect(values.valid_sd?).to eq false
       end
       it "returns false for teacher questions" do
         headers = %w[t-sbel-q5 t-phys-q1 t-phys-q2 RecordedDate]
-        values = SurveyItemValues.new(row: { "RecordedDate" => recorded_date, "Dese ID" => "1234", "t-sbel-q5" => "1", "t-phys-q2" => "1" }, headers:, genders:, survey_items:,
+        values = SurveyItemValues.new(row: { "RecordedDate" => recorded_date, "Dese ID" => "1234", "t-sbel-q5" => "1", "t-phys-q2" => "1" }, headers:,  survey_items:,
                                       schools: School.school_hash)
         expect(values.valid_sd?).to eq false
       end