diff --git a/app/models/spree/user.rb b/app/models/spree/user.rb
index 17d4dc2978..135e54d306 100644
--- a/app/models/spree/user.rb
+++ b/app/models/spree/user.rb
@@ -1,7 +1,5 @@
 module Spree
   class User < ActiveRecord::Base
-    include Core::UserBanners
-
     devise :database_authenticatable, :token_authenticatable, :registerable, :recoverable,
            :rememberable, :trackable, :validatable, :encryptable, encryptor: 'authlogic_sha512'
 
diff --git a/app/views/spree/admin/shared/_address_form_simple.html.haml b/app/views/spree/admin/shared/_address_form_simple.html.haml
deleted file mode 100644
index 36f49bf384..0000000000
--- a/app/views/spree/admin/shared/_address_form_simple.html.haml
+++ /dev/null
@@ -1,24 +0,0 @@
-%tr{"data-hook" => "address1"}
-  %td
-    = t(:admin_shared_address_1):
-  %td= f.text_field :address1
-%tr{"data-hook" => "address2" }
-  %td
-    = t(:admin_shared_address_2):
-  %td= f.text_field :address2
-%tr{"data-hook" => "city" }
-  %td
-    = t(:admin_share_city):
-  %td= f.text_field :city
-%tr{"data-hook" => "zipcode" }
-  %td
-    = t(:admin_share_zipcode):
-  %td= f.text_field :zipcode
-%tr{"data-hook" => "country" }
-  %td
-    = t(:admin_share_country):
-  %td= f.collection_select(:country_id, available_countries, :id, :name)
-%tr{"data-hook" => "state" }
-  %td
-    = t(:admin_share_state):
-  %td= f.collection_select(:state_id, f.object.country.states, :id, :name)