diff --git a/app/models/blocked_domain.rb b/app/models/blocked_domain.rb
index 3708dd6e6..b668e3147 100644
--- a/app/models/blocked_domain.rb
+++ b/app/models/blocked_domain.rb
@@ -25,18 +25,11 @@ class BlockedDomain < ActiveRecord::Base
 
     wr = Whois::Record.find_or_initialize_by(name: name)
     wr.json = @json = generate_json # we need @json to bind to class
-    wr.body = generate_body
     wr.save
   end
 
   alias_method :update_whois_record, :generate_data
 
-
-  def generate_body
-    template = Rails.root.join("app/views/for_models/whois_other.erb".freeze)
-    ERB.new(template.read, nil, "-").result(binding)
-  end
-
   def generate_json
     h = HashWithIndifferentAccess.new
     h[:name]       = self.name
diff --git a/app/models/reserved_domain.rb b/app/models/reserved_domain.rb
index e80b96c24..0db778fdb 100644
--- a/app/models/reserved_domain.rb
+++ b/app/models/reserved_domain.rb
@@ -51,17 +51,10 @@ class ReservedDomain < ActiveRecord::Base
 
     wr = Whois::Record.find_or_initialize_by(name: name)
     wr.json = @json = generate_json # we need @json to bind to class
-    wr.body = generate_body
     wr.save
   end
   alias_method :update_whois_record, :generate_data
 
-
-  def generate_body
-    template = Rails.root.join("app/views/for_models/whois_other.erb".freeze)
-    ERB.new(template.read, nil, "-").result(binding)
-  end
-
   def generate_json
     h = HashWithIndifferentAccess.new
     h[:name]       = self.name
diff --git a/app/models/whois_record.rb b/app/models/whois_record.rb
index 43fd7704d..2c6f79fcd 100644
--- a/app/models/whois_record.rb
+++ b/app/models/whois_record.rb
@@ -3,7 +3,7 @@ class WhoisRecord < ActiveRecord::Base
   belongs_to :domain
   belongs_to :registrar
 
-  validates :domain, :name, :body, :json, presence: true
+  validates :domain, :name, :json, presence: true
 
   before_validation :populate
   after_save :update_whois_server
@@ -87,23 +87,15 @@ class WhoisRecord < ActiveRecord::Base
     h
   end
 
-  def generated_body
-    template_name = domain.discarded? ? 'whois_discarded.erb' : 'whois.erb'
-    template = Rails.root.join("app/views/for_models/#{template_name}".freeze)
-    ERB.new(template.read, nil, "-").result(binding)
-  end
-
   def populate
     return if domain_id.blank?
     self.json = generated_json
-    self.body = generated_body
     self.name = json['name']
     self.registrar_id = domain.registrar_id if domain # for faster registrar updates
   end
 
   def update_whois_server
     wd = Whois::Record.find_or_initialize_by(name: name)
-    wd.body = body
     wd.json = json
     wd.save
   end
diff --git a/app/views/for_models/whois.erb b/app/views/for_models/whois.erb
deleted file mode 100644
index 02b9b1398..000000000
--- a/app/views/for_models/whois.erb
+++ /dev/null
@@ -1,67 +0,0 @@
-<%- if json['disclaimer'].present? -%>
-<%= json['disclaimer'].scan(/\S.{0,72}\S(?=\s|$)|\S+/).join("\n") %>
-<%- end -%>
-Estonia .ee Top Level Domain WHOIS server
-
-Domain:
-name:       <%= json['name'] %>
-<%- for st in Array(json['status']) -%>
-status:     <%= st %>
-<%- end -%>
-registered: <%= json['registered'].to_s.tr('T',' ').sub('+', ' +') %>
-changed:    <%= json['changed'].to_s.tr('T',' ').sub('+', ' +') %>
-expire:     <%= json['expire'].to_s.tr('T',' ').sub('+', ' +') %>
-outzone:    <%= json['outzone'].to_s.tr('T',' ').sub('+', ' +') %>
-delete:     <%= json['delete'].to_s.tr('T',' ').sub('+', ' +') %>
-
-Registrant:
-name:    <%= json['registrant'] %>
-<% if json['registrant_kind'] != 'priv' -%>
-org id:  <%= json['registrant_reg_no'] %>
-country: <%= json['registrant_ident_country_code'] %>
-<% end -%>
-email:   Not Disclosed - Visit www.internet.ee for webbased WHOIS
-changed: <%= json['registrant_changed'].to_s.tr('T',' ').sub('+', ' +') %>
-
-<%- if json['admin_contacts'].present? -%>
-Administrative contact:
-<%- for contact in json['admin_contacts'] -%>
-name:       Not Disclosed
-email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS
-changed:    Not Disclosed
-<%- end -%>
-
-<%- end -%>
-<% if json['tech_contacts'].present? %>
-Technical contact:
-<%- for contact in json['tech_contacts'] -%>
-name:       Not Disclosed
-email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS
-changed:    Not Disclosed
-<%- end -%>
-
-<%- end -%>
-Registrar:
-name:       <%= json['registrar'] %>
-url:        <%= json['registrar_website'] %>
-phone:      <%= json['registrar_phone'] %>
-changed:    <%= json['registrar_changed'].to_s.tr('T',' ').sub('+', ' +') %>
-
-<%- if json['nameservers'].present? -%>
-Name servers:
-<%- for server in json['nameservers'] -%>
-nserver:   <%= server %>
-<%- end -%>
-changed:   <%= json['nameservers_changed'].to_s.tr('T',' ').sub('+', ' +') %>
-
-<%- end -%>
-<%- if json['dnssec_keys'].present? -%>
-DNSSEC:
-<%- for key in json['dnssec_keys'] -%>
-dnskey:   <%= key %>
-<%- end -%>
-changed:  <%= json['dnssec_changed'].to_s.tr('T',' ').sub('+', ' +') %>
-
-<%- end -%>
-Estonia .ee Top Level Domain WHOIS server
-More information at http://internet.ee
diff --git a/app/views/for_models/whois_discarded.erb b/app/views/for_models/whois_discarded.erb
deleted file mode 100644
index ecaa6f9af..000000000
--- a/app/views/for_models/whois_discarded.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Estonia .ee Top Level Domain WHOIS server
-
-Domain:
-name:       <%= json['name'] %>
-status:     <%= json['status'] %>
-
-Estonia .ee Top Level Domain WHOIS server
-More information at http://internet.ee
diff --git a/app/views/for_models/whois_other.erb b/app/views/for_models/whois_other.erb
deleted file mode 100644
index 33ee735e7..000000000
--- a/app/views/for_models/whois_other.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Estonia .ee Top Level Domain WHOIS server
-
-Domain:
-name:       <%= @json['name'] %>
-status:     <%= @json['status'] %>
-
-Estonia .ee Top Level Domain WHOIS server
-More information at http://internet.ee
diff --git a/test/fixtures/whois_records.yml b/test/fixtures/whois_records.yml
index 0cdd25431..6b0e31a7f 100644
--- a/test/fixtures/whois_records.yml
+++ b/test/fixtures/whois_records.yml
@@ -1,6 +1,5 @@
 shop:
   name: shop.test
   domain: shop
-  body: WHOIS text
   json:
     name: shop.test
diff --git a/test/models/whois_record_test.rb b/test/models/whois_record_test.rb
index cd796742d..a806a26d5 100644
--- a/test/models/whois_record_test.rb
+++ b/test/models/whois_record_test.rb
@@ -32,29 +32,9 @@ class WhoisRecordTest < ActiveSupport::TestCase
     end
   end
 
-  def test_generated_body_has_justified_disclaimer
-    expected_disclaimer = begin
-      'Search results may not be used for commercial, advertising, recompilation,\n' \
-      'repackaging, redistribution, reuse, obscuring or other similar activities.'
-    end
-    expected_technical_contact = begin
-      'Technical contact:\n' \
-      'name:       Not Disclosed\n' \
-      'email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS\n' \
-      'changed:    Not Disclosed'
-    end
-
-    regexp_contact = Regexp.new(expected_technical_contact, Regexp::MULTILINE)
-    regexp_disclaimer = Regexp.new(expected_disclaimer, Regexp::MULTILINE)
-
-    assert_match(regexp_disclaimer,        @record.body)
-    assert_match(regexp_contact,           @record.body)
-  end
-
   def test_whois_record_has_no_disclaimer_if_Setting_is_blank
     Setting.stubs(:registry_whois_disclaimer, '') do
       refute(@record.json['disclaimer'])
-      refute_match(/Search results may not be used for commercial/, @record.body)
     end
   end