diff --git a/app/views/admin/contacts/partials/_domains.haml b/app/views/admin/contacts/partials/_domains.haml
index 9d7e3edf5..3a60074d1 100644
--- a/app/views/admin/contacts/partials/_domains.haml
+++ b/app/views/admin/contacts/partials/_domains.haml
@@ -1,5 +1,5 @@
 - domains = contact.all_domains(page: params[:domain_page], per: 20, params: params)
-#contacts.panel.panel-default
+.panel.panel-default
   .panel-heading
     .pull-left
       = t(:domains)
diff --git a/app/views/admin/contacts/partials/_statuses.haml b/app/views/admin/contacts/partials/_statuses.haml
deleted file mode 100644
index c39075754..000000000
--- a/app/views/admin/contacts/partials/_statuses.haml
+++ /dev/null
@@ -1,21 +0,0 @@
-- panel_class = contact.errors.messages[:statuses] ? 'panel-danger' : 'panel-default'
-#contact_statuses.panel{class: panel_class}
-  .panel-heading.clearfix
-    = t(:statuses)
-  .table-responsive
-    %table.table.table-hover.table-bordered.table-condensed
-      %thead
-        %tr
-          %th{class: 'col-xs-6'}= t(:status)
-          %th{class: 'col-xs-6'}= t(:notes)
-      %tbody
-        - contact.statuses.each do |status|
-          %tr
-            %td= status
-            %td= contact.status_notes[status]
-
-      - if contact.errors.messages[:statuses]
-        %tfoot
-          - @domain.errors.messages[:statuses].each do |s|
-            %tr
-              %td{colspan: 4}= s
diff --git a/app/views/admin/contacts/partials/_statuses.html.erb b/app/views/admin/contacts/partials/_statuses.html.erb
new file mode 100644
index 000000000..2d1703c2c
--- /dev/null
+++ b/app/views/admin/contacts/partials/_statuses.html.erb
@@ -0,0 +1,23 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <%= t '.header' %>
+    </div>
+
+    <table class="table table-hover table-bordered table-condensed">
+        <thead>
+            <tr>
+                <th class="col-xs-6"><%= t(:status) %></th>
+                <th class="col-xs-6"><%= t(:notes) %></th>
+            </tr>
+        </thead>
+
+        <tbody>
+            <% contact.statuses.each do |status| %>
+                <tr>
+                    <td><%= status %></td>
+                    <td><%= contact.status_notes[status] %></td>
+                </tr>
+            <% end %>
+        </tbody>
+    </table>
+</div>
diff --git a/app/views/epp/contacts/_disclosure_policy.xml.builder b/app/views/epp/contacts/_disclosure_policy.xml.builder
deleted file mode 100644
index f3ba88159..000000000
--- a/app/views/epp/contacts/_disclosure_policy.xml.builder
+++ /dev/null
@@ -1,9 +0,0 @@
-if @disclosure_policy
-  @disclosure_policy.each do |k,v|
-    xml.tag!('contact:disclose', 'flag' => k) do
-      v.each do |attr|
-        xml.tag!("contact:#{attr}")
-      end
-    end
-  end
-end
diff --git a/app/views/epp/contacts/_postal_info.xml.builder b/app/views/epp/contacts/_postal_info.xml.builder
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/epp/contacts/info.xml.builder b/app/views/epp/contacts/info.xml.builder
index 068622203..38a96a706 100644
--- a/app/views/epp/contacts/info.xml.builder
+++ b/app/views/epp/contacts/info.xml.builder
@@ -75,7 +75,6 @@ xml.epp_head do
           xml.tag!('contact:pw', 'No access')
           end
         end
-        # xml << render('/epp/contacts/disclosure_policy')
       end
     end
     if can? :view_full_info, @contact, @password
diff --git a/app/views/registrar/contacts/partials/_domains.haml b/app/views/registrar/contacts/partials/_domains.haml
index d2943e8ef..f409a6f24 100644
--- a/app/views/registrar/contacts/partials/_domains.haml
+++ b/app/views/registrar/contacts/partials/_domains.haml
@@ -1,5 +1,5 @@
 - domains = contact.all_domains(page: params[:domain_page], per: 20, params: params)
-#contacts.panel.panel-default
+.panel.panel-default
   .panel-heading
     .pull-left
       = t(:domains)
diff --git a/config/locales/admin/contacts.en.yml b/config/locales/admin/contacts.en.yml
index 0ae48821f..44759886a 100644
--- a/config/locales/admin/contacts.en.yml
+++ b/config/locales/admin/contacts.en.yml
@@ -15,3 +15,6 @@ en:
 
         domains:
           roles: Roles
+
+        statuses:
+          header: Statuses