diff --git a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
index 8d4cf2f4f0..adaabc0a1d 100644
--- a/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
+++ b/osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
@@ -22,22 +22,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
         // (higher = more performant, but higher false-negative chance).
         private const int path_step_size = 5;
 
-        private readonly IssueTemplateOffscreenCircle templateOffscreenCircle;
-        private readonly IssueTemplateOffscreenSlider templateOffscreenSlider;
-        private readonly IssueTemplate[] templates;
-
-        public CheckOffscreenObjects()
-        {
-            templates = new IssueTemplate[]
-            {
-                templateOffscreenCircle = new IssueTemplateOffscreenCircle(this),
-                templateOffscreenSlider = new IssueTemplateOffscreenSlider(this)
-            };
-        }
-
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Offscreen hitobjects");
 
-        public IEnumerable<IssueTemplate> PossibleTemplates => templates;
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateOffscreenCircle(this),
+            new IssueTemplateOffscreenSlider(this)
+        };
 
         public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
@@ -56,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
                     case HitCircle circle:
                     {
                         if (isOffscreen(circle.StackedPosition, circle.Radius))
-                            yield return templateOffscreenCircle.Create(circle);
+                            yield return new IssueTemplateOffscreenCircle(this).Create(circle);
 
                         break;
                     }
@@ -82,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
 
                 // `SpanDuration` ensures we don't include reverses.
                 double time = slider.StartTime + progress * slider.SpanDuration;
-                yield return templateOffscreenSlider.Create(slider, time);
+                yield return new IssueTemplateOffscreenSlider(this).Create(slider, time);
 
                 yield break;
             }
@@ -91,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
             if (!isOffscreen(slider.StackedEndPosition, slider.Radius))
                 yield break;
 
-            yield return templateOffscreenSlider.Create(slider, slider.EndTime);
+            yield return new IssueTemplateOffscreenSlider(this).Create(slider, slider.EndTime);
         }
 
         private bool isOffscreen(Vector2 position, double radius)
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
index 1a766798cb..b0c1d6eb4b 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
@@ -10,28 +10,19 @@ namespace osu.Game.Rulesets.Edit.Checks
 {
     public class CheckBackground : ICheck
     {
-        private readonly IssueTemplateNoneSet templateNoneSet;
-        private readonly IssueTemplateDoesNotExist templateDoesNotExist;
-        private readonly IssueTemplate[] templates;
-
-        public CheckBackground()
-        {
-            templates = new IssueTemplate[]
-            {
-                templateNoneSet = new IssueTemplateNoneSet(this),
-                templateDoesNotExist = new IssueTemplateDoesNotExist(this)
-            };
-        }
-
         public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Missing background");
 
-        public IEnumerable<IssueTemplate> PossibleTemplates => templates;
+        public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
+        {
+            new IssueTemplateNoneSet(this),
+            new IssueTemplateDoesNotExist(this)
+        };
 
         public IEnumerable<Issue> Run(IBeatmap beatmap)
         {
             if (beatmap.Metadata.BackgroundFile == null)
             {
-                yield return templateNoneSet.Create();
+                yield return new IssueTemplateNoneSet(this).Create();
 
                 yield break;
             }
@@ -44,7 +35,7 @@ namespace osu.Game.Rulesets.Edit.Checks
             if (file != null)
                 yield break;
 
-            yield return templateDoesNotExist.Create(beatmap.Metadata.BackgroundFile);
+            yield return new IssueTemplateDoesNotExist(this).Create(beatmap.Metadata.BackgroundFile);
         }
 
         private class IssueTemplateNoneSet : IssueTemplate