diff --git a/app/models/user.rb b/app/models/user.rb
index a22841c42..f16a77b0c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,8 +1,9 @@
 class User < ApplicationRecord
-  include Accessor, Assignee, Avatar, Role, Transferable
+  include Accessor, Assignee, Role, Transferable
 
   has_many :sessions, dependent: :destroy
   has_secure_password validations: false
+  has_one_attached :avatar
 
   has_many :comments, inverse_of: :creator, dependent: :destroy
 
diff --git a/app/models/user/avatar.rb b/app/models/user/avatar.rb
deleted file mode 100644
index a9d2ad12e..000000000
--- a/app/models/user/avatar.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module User::Avatar
-  extend ActiveSupport::Concern
-
-  included do
-    has_one_attached :avatar
-  end
-
-  class_methods do
-    def from_avatar_token(sid)
-      find_signed!(sid, purpose: :avatar)
-    end
-  end
-
-  def avatar_token
-    signed_id(purpose: :avatar)
-  end
-end