diff --git a/app/views/hyrax/base/_analytics_button.html.erb b/app/views/hyrax/base/_analytics_button.html.erb
deleted file mode 100644
index 1769b06122..0000000000
--- a/app/views/hyrax/base/_analytics_button.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if Hyrax.config.analytics? %>
-  <% # turbolinks needs to be turned off or the page will use the cache and the %>
-  <% # analytics graph will not show unless the page is refreshed. %>
-  <%= link_to t('.analytics'), @presenter.stats_path, id: 'stats', class: 'btn btn-secondary btn-block center-block', data: { turbolinks: false } %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/hyrax/base/_show_actions.html.erb b/app/views/hyrax/base/_show_actions.html.erb
index 170cf448aa..d28dcaab67 100644
--- a/app/views/hyrax/base/_show_actions.html.erb
+++ b/app/views/hyrax/base/_show_actions.html.erb
@@ -18,7 +18,7 @@
             class: presenter.display_unfeature_link? ? 'btn btn-secondary' : 'btn btn-secondary collapse' %>
       <% end %>
     <% end %>
-    <% if Hyrax.config.analytics? %>
+    <% if Hyrax.config.analytics_reporting? %>
       <% # turbolinks needs to be turned off or the page will use the cache and the %>
       <% # analytics graph will not show unless the page is refreshed. %>
       <%= link_to t('.analytics'), presenter.stats_path, id: 'stats', class: 'btn btn-secondary', data: { turbolinks: false } %>
diff --git a/app/views/hyrax/base/show.html.erb b/app/views/hyrax/base/show.html.erb
index 5026853296..48d6daca63 100644
--- a/app/views/hyrax/base/show.html.erb
+++ b/app/views/hyrax/base/show.html.erb
@@ -39,9 +39,6 @@
             <div class="col-sm-3 text-center">
               <%= render('download_pdf', presenter: @presenter, file_set_id: @presenter.file_set_presenters.first.id) if @presenter.show_pdf_download_button? %>
               <%= render 'citations', presenter: @presenter %>
-              <!-- OVERRIDE: analytics_button is disabled until future fix -->
-              <%#= render 'analytics_button', presenter: @presenter %>
-              <!-- OVERRIDE: remove social_media -->
             </div>
           <% end %>
           <div class="col-sm-9">
diff --git a/app/views/hyrax/dashboard/sidebar/_activity.html.erb b/app/views/hyrax/dashboard/sidebar/_activity.html.erb
index 770f0b4492..1ad4646113 100644
--- a/app/views/hyrax/dashboard/sidebar/_activity.html.erb
+++ b/app/views/hyrax/dashboard/sidebar/_activity.html.erb
@@ -67,7 +67,7 @@
   </li>
 <% end %>
 
-<% if current_ability.can_create_any_work? && Hyrax.config.analytics? %>
+<% if current_ability.can_create_any_work? && Hyrax.config.analytics_reporting? %>
   <li class="nav-item">
     <%= menu.collapsable_section t('hyrax.admin.sidebar.analytics'),
                                   icon_class: "fa fa-pie-chart",
diff --git a/app/views/hyrax/oers/show.html.erb b/app/views/hyrax/oers/show.html.erb
index b3804f300d..876281fae4 100644
--- a/app/views/hyrax/oers/show.html.erb
+++ b/app/views/hyrax/oers/show.html.erb
@@ -15,7 +15,7 @@
     <div class="card card-default">
       <div class="card-heading">
         <%= render 'work_title', presenter: @presenter %>
-        <%= render 'show_actions', presenter: @presenter %> 
+        <%= render 'show_actions', presenter: @presenter %>
       </div>
       <div class="card-body">
         <div class="row">
@@ -34,8 +34,6 @@
           <div class="col-sm-3 text-center">
             <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.iiif_viewer? || @presenter.show_pdf_viewer? %>
             <%= render 'citations', presenter: @presenter %>
-            <!-- analytics_button is disabled until future fix -->
-            <%#= render 'analytics_button', presenter: @presenter %>
           </div>
           <% end %>
           <% if @presenter.viewer? %>
diff --git a/app/views/themes/cultural_show/hyrax/base/show.html.erb b/app/views/themes/cultural_show/hyrax/base/show.html.erb
index 7864fd0fb9..d4cd70e2d9 100644
--- a/app/views/themes/cultural_show/hyrax/base/show.html.erb
+++ b/app/views/themes/cultural_show/hyrax/base/show.html.erb
@@ -41,8 +41,6 @@
             <div class="citations-container">
               <%= render 'citations', presenter: @presenter %>
             </div>
-            <!-- analytics_button is disabled until future fix -->
-            <%#= render 'analytics_button', presenter: @presenter %>
           </div>
           <div class="col-12 work-show-items">
             <%= render 'items', presenter: @presenter %>
diff --git a/app/views/themes/cultural_show/hyrax/oers/show.html.erb b/app/views/themes/cultural_show/hyrax/oers/show.html.erb
index 9a20b320f8..1ee2ffca56 100644
--- a/app/views/themes/cultural_show/hyrax/oers/show.html.erb
+++ b/app/views/themes/cultural_show/hyrax/oers/show.html.erb
@@ -30,8 +30,6 @@
                 <br/>
                   <%= render('download_pdf', presenter: @presenter, file_set_id: @presenter.file_set_presenters.first.id) if @presenter.show_pdf_download_button? %>
                   <%= render 'citations', presenter: @presenter %>
-                  <!-- analytics_button is disabled until future fix -->
-                  <%#= render 'analytics_button', presenter: @presenter %>
                 <br/>
               </div>
             <% end %>
@@ -54,8 +52,6 @@
                   <br/>
                     <%= render('download_pdf', presenter: @presenter, file_set_id: @presenter.file_set_presenters.first.id) if @presenter.show_pdf_download_button? %>
                     <%= render 'citations', presenter: @presenter %>
-                    <!-- analytics_button is disabled until future fix -->
-                    <%#= render 'analytics_button', presenter: @presenter %>
                   <br/>
                 </div>
               <% end %>
diff --git a/app/views/themes/image_show/hyrax/base/show.html.erb b/app/views/themes/image_show/hyrax/base/show.html.erb
index e708618924..a74e25d35e 100644
--- a/app/views/themes/image_show/hyrax/base/show.html.erb
+++ b/app/views/themes/image_show/hyrax/base/show.html.erb
@@ -48,8 +48,6 @@
           <div class="col-sm-3 citations-social text-right">
             <%= render('download_pdf', presenter: @presenter, file_set_id: @presenter.file_set_presenters.first.id) if @presenter.show_pdf_download_button? %>
             <%= render 'citations', presenter: @presenter %>
-            <!-- analytics_button is disabled until future fix -->
-            <%#= render 'analytics_button', presenter: @presenter %>
           </div>
           <div class="col-sm-12">
             <%= render 'relationships', presenter: @presenter %>
diff --git a/app/views/themes/scholarly_show/hyrax/base/show.html.erb b/app/views/themes/scholarly_show/hyrax/base/show.html.erb
index fb8a69050e..6ee5ad080b 100644
--- a/app/views/themes/scholarly_show/hyrax/base/show.html.erb
+++ b/app/views/themes/scholarly_show/hyrax/base/show.html.erb
@@ -57,8 +57,6 @@
           <div class="col-sm-3 text-center">
             <%= render('download_pdf', presenter: @presenter, file_set_id: @presenter.file_set_presenters.first.id) if @presenter.show_pdf_download_button? %>
             <%= render 'citations', presenter: @presenter %>
-            <!-- analytics_button is disabled until future fix -->
-            <%#= render 'analytics_button', presenter: @presenter %>
           </div>
         </div>
         <div class="row">
diff --git a/app/views/themes/scholarly_show/hyrax/oers/show.html.erb b/app/views/themes/scholarly_show/hyrax/oers/show.html.erb
index 160dee116e..ba95d3c324 100644
--- a/app/views/themes/scholarly_show/hyrax/oers/show.html.erb
+++ b/app/views/themes/scholarly_show/hyrax/oers/show.html.erb
@@ -48,8 +48,6 @@
           <div class="col-sm-6">
             <%= render('download_pdf', presenter: @presenter, file_set_id: @presenter.file_set_presenters.first.id) if @presenter.show_pdf_download_button? %>
             <%= render 'citations', presenter: @presenter %>
-            <!-- analytics_button is disabled until future fix -->
-            <%#= render 'analytics_button', presenter: @presenter %>
           </div>
           <div class="col-sm-12">
             <%= render 'relationships', presenter: @presenter %>