diff --git a/app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml b/app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml
index 4c6a86e926..44080e3fe0 100644
--- a/app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml
+++ b/app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml
@@ -14,9 +14,6 @@
       .exchange-product{'ng-repeat' => 'product in supplied_products | filter:productSuppliedToOrderCycle | visibleProducts:exchange:order_cycle.visible_variants_for_outgoing_exchanges | orderBy:"name"' }
         .exchange-product-details
           %label
-            -# MASTER_VARIANTS: No longer required
-            -# = check_box_tag 'order_cycle_outgoing_exchange_{{ $parent.$index }}_variants_{{ product.master_id }}', 1, 1, 'ng-hide' => 'product.variants.length > 0', 'ng-model' => 'exchange.variants[product.master_id]', 'id' => 'order_cycle_outgoing_exchange_{{ $parent.$index }}_variants_{{ product.master_id }}',
-            -# 'ng-disabled' => 'product.variants.length > 0 || !order_cycle.editable_variants_for_outgoing_exchanges.hasOwnProperty(exchange.enterprise_id) || order_cycle.editable_variants_for_outgoing_exchanges[exchange.enterprise_id].indexOf(product.master_id) < 0'
             %img{'ng-src' => '{{ product.image_url }}'}
             .name {{ product.name }}
           .supplier {{ product.supplier_name }}
diff --git a/app/views/admin/enterprises/form/_properties.html.haml b/app/views/admin/enterprises/form/_properties.html.haml
index 795a104f1a..e3271435db 100644
--- a/app/views/admin/enterprises/form/_properties.html.haml
+++ b/app/views/admin/enterprises/form/_properties.html.haml
@@ -1,12 +1 @@
 = render 'admin/producer_properties/form', f: f
-
-// :javascript
-//   var properties = #{raw(@properties.to_json)};
-//
-//   $("#producer_properties input.autocomplete").live("keydown", function() {
-//     already_auto_completed = $(this).is('ac_input');
-//     if (!already_auto_completed) {
-//       $(this).autocomplete({source: properties});
-//       $(this).focus();
-//     }
-//   });
diff --git a/app/views/shared/_copyright.html.haml b/app/views/shared/_copyright.html.haml
deleted file mode 100644
index 66ee8d9b4e..0000000000
--- a/app/views/shared/_copyright.html.haml
+++ /dev/null
@@ -1,3 +0,0 @@
--##copyright.text-center
-  -#%img.copyright{src: "/assets/logo.png", alt: "Open Food Network"}
-  -#&copy; Copyright 2013 Open Food Foundation
diff --git a/app/views/spree/checkout/payment/_paypal.html.haml b/app/views/spree/checkout/payment/_paypal.html.haml
index e69de29bb2..1cc8aa25a7 100644
--- a/app/views/spree/checkout/payment/_paypal.html.haml
+++ b/app/views/spree/checkout/payment/_paypal.html.haml
@@ -0,0 +1 @@
+-# This file intentionally overrides the view in the spree_paypal_express gem