diff --git a/app/controllers/spree/admin/general_settings_controller_decorator.rb b/app/controllers/spree/admin/general_settings_controller_decorator.rb
index 0a44da39e3..603f74bf63 100644
--- a/app/controllers/spree/admin/general_settings_controller_decorator.rb
+++ b/app/controllers/spree/admin/general_settings_controller_decorator.rb
@@ -8,7 +8,6 @@ module Spree
       def edit
         super
         @preferences_general << :bugherd_api_key
-        @preferences_terms_of_service = [:enterprises_require_tos]
       end
     end
     GeneralSettingsController.send(:prepend, GeneralSettingsEditPreferences)
diff --git a/spec/features/consumer/registration_spec.rb b/spec/features/consumer/registration_spec.rb
index f770194669..ae4f621684 100644
--- a/spec/features/consumer/registration_spec.rb
+++ b/spec/features/consumer/registration_spec.rb
@@ -12,8 +12,6 @@ feature "Registration", js: true do
       visit registration_path
 
       expect(Spree::Config.enterprises_require_tos).to eq false
-      Spree::Config[:enterprises_require_tos].should be false
-
       expect(URI.parse(current_url).path).to eq registration_auth_path
 
       page.has_selector? "dd", text: "Login"
@@ -159,14 +157,6 @@ feature "Registration", js: true do
     expect(page).to have_content content
   end
 
-  def wait_for(element)
-    using_wait_time 0.5 do
-      10.times do
-        break if page.has_selector? element
-      end
-    end
-  end
-
   def click_and_ensure(type, text, check)
     # Buttons appear to be unresponsive for a while, so keep clicking them until content appears
     using_wait_time 0.5 do