diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 93c559c..4ca68ff 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -104,14 +104,6 @@ Style/AlignParameters:
     - 'app/models/problem.rb'
     - 'config/initializers/devise.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AndOr:
-  Exclude:
-    - 'app/controllers/users_controller.rb'
-    - 'app/models/error_report.rb'
-
 # Offense count: 105
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2e606ed..b95a234 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -55,7 +55,7 @@ class UsersController < ApplicationController
 
     def require_user_edit_priviledges
       can_edit = current_user == user || current_user.admin?
-      redirect_to(root_path) and return(false) unless can_edit
+      redirect_to(root_path) unless can_edit
     end
 
   def user_params
diff --git a/app/models/error_report.rb b/app/models/error_report.rb
index d2b4020..037d22a 100644
--- a/app/models/error_report.rb
+++ b/app/models/error_report.rb
@@ -94,7 +94,7 @@ class ErrorReport
 
   # Launch all notification define on the app associate to this notice
   def services_notification
-    return true unless app.notification_service_configured? and should_notify?
+    return true unless app.notification_service_configured? && should_notify?
     app.notification_service.create_notification(problem)
   rescue => e
     HoptoadNotifier.notify(e)
--
libgit2 0.21.2