diff --git a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
index 22b792cee4..9b583494cb 100644
--- a/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
+++ b/osu.Game.Tests/Scores/IO/ImportScoreTest.cs
@@ -10,7 +10,6 @@ using NUnit.Framework;
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.IO.Archives;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Rulesets.Mods;
@@ -162,7 +161,7 @@ namespace osu.Game.Tests.Scores.IO
             var scoreManager = osu.Dependencies.Get<ScoreManager>();
             await scoreManager.Import(score, archive);
 
-            return scoreManager.Query(_ => true).Detach();
+            return scoreManager.Query(_ => true);
         }
 
         internal class TestArchiveReader : ArchiveReader
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index 17168bf07f..63df6a6390 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
             imported?.PerformRead(s =>
             {
-                beatmapInfo = s.Beatmaps[0].Detach();
+                beatmapInfo = s.Beatmaps[0];
 
                 for (int i = 0; i < 50; i++)
                 {
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index 8a2ee95020..fb32c11365 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -188,7 +188,7 @@ namespace osu.Game.Beatmaps
 
         public int BeatmapVersion;
 
-        public BeatmapInfo Clone() => (BeatmapInfo)this.Detach().MemberwiseClone();
+        public BeatmapInfo Clone() => (BeatmapInfo)MemberwiseClone();
 
         public override string ToString() => this.GetDisplayTitle();
 
diff --git a/osu.Game/Beatmaps/WorkingBeatmapCache.cs b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
index e1399c5272..6947752c47 100644
--- a/osu.Game/Beatmaps/WorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmapCache.cs
@@ -84,7 +84,6 @@ namespace osu.Game.Beatmaps
                 if (working != null)
                     return working;
 
-                // TODO: FUCK THE WORLD :D
                 beatmapInfo = beatmapInfo.Detach();
 
                 workingCache.Add(working = new BeatmapManagerWorkingBeatmap(beatmapInfo, this));
diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index f355554482..8b4de447e5 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -682,9 +682,7 @@ namespace osu.Game.Screens.Select
             if (beatmapSet.Beatmaps.All(b => b.Hidden))
                 return null;
 
-            // TODO: FUCK THE WORLD :D
-            if (beatmapSet.IsManaged)
-                beatmapSet = beatmapSet.Detach();
+            beatmapSet = beatmapSet.Detach();
 
             var set = new CarouselBeatmapSet(beatmapSet)
             {