diff --git a/app/models/member.rb b/app/models/member.rb
index 799f28c3fdf..cbcc54c0250 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -171,8 +171,8 @@ class Member < ActiveRecord::Base
     end
   end
 
-  def notification
-    @notification ||= user.notification_settings.find_by(source: source)
+  def notification_setting
+    @notification_setting ||= user.notification_settings.find_by(source: source)
   end
 
   private
diff --git a/app/models/notification.rb b/app/models/notification.rb
deleted file mode 100644
index 3805bde88b0..00000000000
--- a/app/models/notification.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Notification
-  attr_accessor :target
-
-  delegate :disabled?, :participating?, :watch?, :global?, :mention?, to: :target
-
-  def initialize(target)
-    @target = target
-  end
-
-  def level
-    target.notification_level
-  end
-end
diff --git a/app/models/user.rb b/app/models/user.rb
index f556dc5903d..af6b86bfa70 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -357,10 +357,6 @@ class User < ActiveRecord::Base
     "#{self.class.reference_prefix}#{username}"
   end
 
-  def notification
-    @notification ||= Notification.new(self)
-  end
-
   def generate_password
     if self.force_random_password
       self.password = self.password_confirmation = Devise.friendly_token.first(8)
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index 23f211dfcd2..0928dda349e 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -329,25 +329,31 @@ class NotificationService
   # Remove users with disabled notifications from array
   # Also remove duplications and nil recipients
   def reject_muted_users(users, project = nil)
-    reject_users(users, :disabled?, project)
+    reject_users(users, :disabled, project)
   end
 
   # Remove users with notification level 'Mentioned'
   def reject_mention_users(users, project = nil)
-    reject_users(users, :mention?, project)
+    reject_users(users, :mention, project)
   end
 
-  # Reject users which method_name from notification object returns true.
+  # Reject users which has certain notification level
   #
   # Example:
-  #   reject_users(users, :watch?, project)
+  #   reject_users(users, :watch, project)
   #
-  def reject_users(users, method_name, project = nil)
+  def reject_users(users, level, project = nil)
+    level = level.to_s
+
+    unless NotificationSetting.levels.keys.include?(level)
+      raise 'Invalid notification level'
+    end
+
     users = users.to_a.compact.uniq
     users = users.reject(&:blocked?)
 
     users.reject do |user|
-      next user.notification.send(method_name) unless project
+      next user.notification_level == level unless project
 
       setting = user.notification_settings.find_by(source: project)
 
@@ -356,13 +362,13 @@ class NotificationService
       end
 
       # reject users who globally set mention notification and has no setting per project/group
-      next user.notification.send(method_name) unless setting
+      next user.notification_level == level unless setting
 
       # reject users who set mention notification in project
-      next true if setting.send(method_name)
+      next true if setting.level == level
 
       # reject users who have mention level in project and disabled in global settings
-      setting.global? && user.notification.send(method_name)
+      setting.global? && user.notification_level == level
     end
   end