diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index c47864855b..3d411d6e12 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Osu.Edit.Checks
 {
-    public class CheckOffscreenObjects : BeatmapCheck
+    public class CheckOffscreenObjects : Check
     {
         // These are close approximates to the edges of the screen
         // in gameplay on a 4:3 aspect ratio for osu!stable.
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
index ee3b230679..d0dbc043d4 100644
--- a/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
+++ b/osu.Game.Rulesets.Osu/Edit/OsuChecker.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Rulesets.Osu.Edit
 {
     public class OsuChecker : Checker
     {
-        public readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
+        public readonly List<Check> beatmapChecks = new List<Check>
         {
             new CheckOffscreenObjects()
         };
diff --git a/osu.Game/Rulesets/Edit/Checker.cs b/osu.Game/Rulesets/Edit/Checker.cs
index 65d7fc5913..6ab6ed75e8 100644
--- a/osu.Game/Rulesets/Edit/Checker.cs
+++ b/osu.Game/Rulesets/Edit/Checker.cs
@@ -12,14 +12,14 @@ namespace osu.Game.Rulesets.Edit
     public abstract class Checker
     {
         // These are all ruleset-invariant, hence here instead of in e.g. `OsuChecker`.
-        private readonly List<BeatmapCheck> beatmapChecks = new List<BeatmapCheck>
+        private readonly IReadOnlyList<Check> checks = new List<Check>
         {
             new CheckBackground()
         };
 
         public virtual IEnumerable<Issue> Run(IBeatmap beatmap)
         {
-            return beatmapChecks.SelectMany(check => check.Run(beatmap));
+            return checks.SelectMany(check => check.Run(beatmap));
         }
     }
 }
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 9376f9568a..aa10fad77b 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Edit.Checks.Components;
 
 namespace osu.Game.Rulesets.Edit.Checks
 {
-    public class CheckBackground : BeatmapCheck
+    public class CheckBackground : Check
     {
         public override CheckMetadata Metadata() => new CheckMetadata
         (
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs b/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
deleted file mode 100644
index d0f93b5eef..0000000000
--- a/osu.Game/Rulesets/Edit/Checks/Components/BeatmapCheck.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Collections.Generic;
-using osu.Game.Beatmaps;
-
-namespace osu.Game.Rulesets.Edit.Checks.Components
-{
-    public abstract class BeatmapCheck : Check<IBeatmap>
-    {
-        /// <summary>
-        /// Returns zero, one, or several issues detected by this
-        /// check on the given beatmap.
-        /// </summary>
-        /// <param name="beatmap">The beatmap to run the check on.</param>
-        /// <returns></returns>
-        public abstract override IEnumerable<Issue> Run(IBeatmap beatmap);
-    }
-}
diff --git a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
index 228c11f0f3..4e444cacbf 100644
--- a/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
+++ b/osu.Game/Rulesets/Edit/Checks/Components/Check.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Generic;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Edit.Checks.Components
 {
@@ -21,21 +22,18 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
         /// <returns></returns>
         public abstract IEnumerable<IssueTemplate> Templates();
 
+        /// <summary>
+        /// Returns zero, one, or several issues detected by this
+        /// check on the given beatmap.
+        /// </summary>
+        /// <param name="beatmap">The beatmap to run the check on.</param>
+        /// <returns></returns>
+        public abstract IEnumerable<Issue> Run(IBeatmap beatmap);
+
         protected Check()
         {
             foreach (var template in Templates())
                 template.Origin = this;
         }
     }
-
-    public abstract class Check<T> : Check
-    {
-        /// <summary>
-        /// Returns zero, one, or several issues detected by
-        /// this check on the given object.
-        /// </summary>
-        /// <param name="obj">The object to run the check on.</param>
-        /// <returns></returns>
-        public abstract IEnumerable<Issue> Run(T obj);
-    }
 }