diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb
index 4500566b0..d9504a71d 100644
--- a/app/controllers/epp/domains_controller.rb
+++ b/app/controllers/epp/domains_controller.rb
@@ -10,17 +10,17 @@ class Epp::DomainsController < EppController
       if domain_name.at_auction?
         @name = domain_name
         @status = 'At auction'
-        render_epp_response '/epp/domains/info_auction'
+        render_epp_response '/epp/domains/info/unregistered_domain'
         return
       elsif domain_name.awaiting_payment?
         @name = domain_name
         @status = 'Awaiting payment'
-        render_epp_response '/epp/domains/info_auction'
+        render_epp_response '/epp/domains/info/unregistered_domain'
         return
       elsif domain_name.pending_registration?
         @name = domain_name
         @status = 'Reserved'
-        render_epp_response '/epp/domains/info_auction'
+        render_epp_response '/epp/domains/info/unregistered_domain'
         return
       end
     end
@@ -42,16 +42,14 @@ class Epp::DomainsController < EppController
       end
 
       render_epp_response '/epp/domains/info/registered_domain'
-    else
-      if domain_name.blocked?
-        @name = domain_name
-        @status = 'Blocked'
-        render_epp_response '/epp/domains/info/unregistered_domain'
-      elsif domain_name.reserved?
-        @name = domain_name
-        @status = 'Reserved'
-        render_epp_response '/epp/domains/info/unregistered_domain'
-      end
+    elsif domain_name.blocked?
+      @name = domain_name
+      @status = 'Blocked'
+      render_epp_response '/epp/domains/info/unregistered_domain'
+    elsif domain_name.reserved?
+      @name = domain_name
+      @status = 'Reserved'
+      render_epp_response '/epp/domains/info/unregistered_domain'
     end
   end
 
diff --git a/app/models/dns/domain_name.rb b/app/models/dns/domain_name.rb
index 090454093..05eea2086 100644
--- a/app/models/dns/domain_name.rb
+++ b/app/models/dns/domain_name.rb
@@ -53,10 +53,6 @@ module DNS
       Whois::Record.refresh(self)
     end
 
-    def to_s
-      name
-    end
-
     def registered?
       Domain.find_by_idn(name)
     end
diff --git a/app/views/epp/domains/info_auction.xml.builder b/app/views/epp/domains/info_auction.xml.builder
deleted file mode 100644
index b95553935..000000000
--- a/app/views/epp/domains/info_auction.xml.builder
+++ /dev/null
@@ -1,16 +0,0 @@
-xml.epp_head do
-  xml.response do
-    xml.result('code' => '1000') do
-      xml.msg 'Command completed successfully'
-    end
-
-    xml.resData do
-      xml.tag! 'domain:infData', 'xmlns:domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd' do
-        xml.tag!('domain:name', @name)
-        xml.tag!('domain:status', 's' => @status)
-      end
-    end
-
-    render('epp/shared/trID', builder: xml)
-  end
-end