diff --git a/app/overrides/spree/admin/payment_methods/_form/remove_clearing_div.deface b/app/overrides/spree/admin/payment_methods/_form/remove_clearing_div.deface
deleted file mode 100644
index 613ffe010b..0000000000
--- a/app/overrides/spree/admin/payment_methods/_form/remove_clearing_div.deface
+++ /dev/null
@@ -1 +0,0 @@
-remove "div.clear"
\ No newline at end of file
diff --git a/app/overrides/spree/admin/payment_methods/_form/replace_form_fields.html.haml.deface b/app/views/spree/admin/payment_methods/_form.html.haml
similarity index 81%
rename from app/overrides/spree/admin/payment_methods/_form/replace_form_fields.html.haml.deface
rename to app/views/spree/admin/payment_methods/_form.html.haml
index 0201278e0e..a740f575e2 100644
--- a/app/overrides/spree/admin/payment_methods/_form/replace_form_fields.html.haml.deface
+++ b/app/views/spree/admin/payment_methods/_form.html.haml
@@ -1,5 +1,3 @@
-/ replace "div[data-hook='admin_payment_method_form_fields']"
-
 = admin_inject_payment_method
 = admin_inject_json_ams_array "admin.paymentMethods", "shops", @hubs, Api::Admin::BasicEnterpriseSerializer
 %div.alpha.eleven.columns{ "ng-app" => "admin.paymentMethods", "ng-controller" => "paymentMethodCtrl" }
@@ -7,23 +5,23 @@
     .alpha.three.columns
       = label_tag nil, t(:name)
     .omega.eight.columns
-      = text_field :payment_method, :name, :class => 'fullwidth'
+      = text_field :payment_method, :name, class: 'fullwidth'
   .row
     .alpha.three.columns
       = label_tag nil, t(:description)
     .omega.eight.columns
-      = text_area :payment_method, :description, {:cols => 60, :rows => 6, :class => 'fullwidth'}
+      = text_area :payment_method, :description, {cols: 60, rows: 6, class: 'fullwidth'}
   - if spree_current_user.admin?
     .row
       .alpha.three.columns
         = label_tag nil, t(:environment)
       .omega.eight.columns
-        = collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {:id => 'gtwy-env', :class => 'select2 fullwidth'})
+        = collection_select(:payment_method, :environment, Rails.configuration.database_configuration.keys.sort, :to_s, :titleize, {}, {id: 'gtwy-env', class: 'select2 fullwidth'})
     .row
       .alpha.three.columns
         = label_tag nil, t(:display)
       .omega.eight.columns
-        = select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'})
+        = select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [t(display), display == :both ? nil : display.to_s] }, {}, {class: 'select2 fullwidth'})
   .row
     .alpha.three.columns
       = label_tag nil, t(:active)
@@ -47,4 +45,4 @@
 
   .row
     .omega.eleven.columns
-      = render partial: 'spree/admin/shared/calculator_fields', :locals => { :f => f }
+      = render partial: 'spree/admin/shared/calculator_fields', locals: { f: f }