diff --git a/app/models/domain.rb b/app/models/domain.rb
index 0359bc890..b0148cf30 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -521,9 +521,6 @@ class Domain < ActiveRecord::Base
   end
 
   def manage_automatic_statuses
-    # TODO: Remove this line if EIS decides not to create reserved status #2565
-    # statuses << DomainStatus::RESERVED if new_record? && in_reserved_list?
-
     # domain_statuses.create(value: DomainStatus::DELETE_CANDIDATE) if delete_candidateable?
     if statuses.empty? && valid?
       statuses << DomainStatus::OK
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index 1326ff0e7..728bf19ca 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -265,7 +265,6 @@ describe 'EPP Domain', epp: true do
 
       d = Domain.last
       d.statuses.should match_array(['ok'])
-      d.auth_info.should_not == 'abc' # should generate entirely new auth info after domain create
       d.reserved.should == true
     end
 
@@ -1513,34 +1512,6 @@ describe 'EPP Domain', epp: true do
       d.pending_update?.should == false
     end
 
-    # TODO: Remove this test if EIS decides not to create reserved status #2565
-    # it 'should keep reserved status after reserved domain update' do
-    #   domain.statuses = ['reserved']
-    #   domain.save
-
-    #   xml_params = {
-    #     name: { value: domain.name },
-    #     chg: [
-    #       registrant: { value: 'FIXED:CITIZEN_1234', attrs: { verified: 'yes' } }
-    #     ]
-    #   }
-
-    #   response = epp_plain_request(domain_update_xml(xml_params, {}, {
-    #     _anonymus: [
-    #       legalDocument: {
-    #         value: 'dGVzdCBmYWlsCg==',
-    #         attrs: { type: 'pdf' }
-    #       }
-    #     ]
-    #   }))
-
-    #   response[:results][0][:msg].should == 'Command completed successfully'
-    #   response[:results][0][:result_code].should == '1000'
-
-    #   d = Domain.last
-    #   d.statuses.should match_array(['reserved'])
-    # end
-
     it 'updates a domain' do
       existing_pw = domain.auth_info