diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 44ed59b1a2..80de3c4a6e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -44,7 +44,7 @@ Lint/DuplicateRequire:
   Exclude:
     - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb'
 
-# Offense count: 18
+# Offense count: 16
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
   Exclude:
@@ -201,8 +201,8 @@ Metrics/ClassLength:
     - 'app/serializers/api/cached_enterprise_serializer.rb'
     - 'app/serializers/api/enterprise_shopfront_serializer.rb'
     - 'app/services/cart_service.rb'
-    - 'app/services/orders/sync_service.rb'
     - 'app/services/order_cycles/form_service.rb'
+    - 'app/services/orders/sync_service.rb'
     - 'engines/order_management/app/services/order_management/order/updater.rb'
     - 'lib/open_food_network/enterprise_fee_calculator.rb'
     - 'lib/open_food_network/order_cycle_form_applicator.rb'
@@ -470,14 +470,13 @@ Rails/LexicallyScopedActionFilter:
     - 'app/controllers/spree/admin/zones_controller.rb'
     - 'app/controllers/spree/users_controller.rb'
 
-# Offense count: 6
+# Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/NegateInclude:
   Exclude:
     - 'app/controllers/admin/resource_controller.rb'
     - 'app/models/calculator/weight.rb'
     - 'app/models/product_import/spreadsheet_entry.rb'
-    - 'app/services/order_cart_reset.rb'
     - 'lib/spree/localized_number.rb'
     - 'spec/support/matchers/table_matchers.rb'
 
@@ -596,8 +595,8 @@ Rails/TimeZone:
   Exclude:
     - 'app/models/spree/gateway/pay_pal_express.rb'
     - 'spec/controllers/spree/credit_cards_controller_spec.rb'
-    - 'spec/services/orders/customer_cancellation_service_spec.rb'
     - 'spec/services/order_cycles/webhook_service_spec.rb'
+    - 'spec/services/orders/customer_cancellation_service_spec.rb'
 
 # Offense count: 1
 # Configuration parameters: TransactionMethods.
@@ -686,7 +685,7 @@ Security/Open:
   Exclude:
     - 'app/services/image_importer.rb'
 
-# Offense count: 9
+# Offense count: 7
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/ArrayIntersect:
   Exclude:
@@ -695,7 +694,6 @@ Style/ArrayIntersect:
     - 'app/models/tag_rule/filter_payment_methods.rb'
     - 'app/models/tag_rule/filter_products.rb'
     - 'app/models/tag_rule/filter_shipping_methods.rb'
-    - 'app/services/order_syncer.rb'
     - 'lib/open_food_network/tag_rule_applicator.rb'
     - 'spec/support/matchers/select2_matchers.rb'