diff --git a/.rubocop.yml b/.rubocop.yml
index b062f48421e..b7edfe48948 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,7 +1,9 @@
 inherit_gem:
   rubocop-discourse: default.yml
 
-inherit_from: .rubocop_todo.yml
+# Still work to do in ensuring we don't link old files
+Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
+  Enabled: false
 
 Discourse/NoResetColumnInformationInMigrations:
   Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
deleted file mode 100644
index 2930dd744ac..00000000000
--- a/.rubocop_todo.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2020-06-17 15:14:48 +0800 using RuboCop version 0.85.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 61
-# Configuration parameters: Include.
-# Include: **/db/migrate/*, **/db/post_migrate/*
-Discourse/NoAddReferenceOrAliasesActiveRecordMigration:
-  Enabled: false
-
-# Offense count: 5
-Discourse/NoNokogiriHtmlFragment:
-  Exclude:
-    - 'plugins/discourse-assign/lib/topic_assigner.rb'
-    - 'plugins/discourse-calendar/app/models/calendar_event.rb'
-    - 'plugins/discourse-chat-integration/lib/discourse_chat/provider/slack/slack_provider.rb'
-    - 'plugins/discourse-code-review/lib/discourse_code_review/state/commit_topics.rb'
-    - 'plugins/discourse-graphviz/plugin.rb'
-
-# Offense count: 1
-Discourse/NoURIEscapeEncode:
-  Exclude:
-    - 'lib/file_store/s3_store.rb'