diff --git a/osu.Game/Beatmaps/BeatmapModelManager.cs b/osu.Game/Beatmaps/BeatmapModelManager.cs
index b909175d2d..f6f2e16410 100644
--- a/osu.Game/Beatmaps/BeatmapModelManager.cs
+++ b/osu.Game/Beatmaps/BeatmapModelManager.cs
@@ -25,6 +25,7 @@ using osu.Game.Rulesets;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Skinning;
 using osu.Game.Stores;
+using Realms;
 using Decoder = osu.Game.Beatmaps.Formats.Decoder;
 
 namespace osu.Game.Beatmaps
@@ -59,24 +60,22 @@ namespace osu.Game.Beatmaps
 
         protected override string[] HashableFileTypes => new[] { ".osu" };
 
-        private readonly BeatmapStore beatmaps;
         private readonly RulesetStore rulesets;
 
-        public BeatmapModelManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, GameHost host = null)
-            : base(storage, contextFactory, new BeatmapStore(contextFactory), host)
+        public BeatmapModelManager(Storage storage, RealmContextFactory contextFactory, RulesetStore rulesets, GameHost host = null)
+            : base(storage, contextFactory)
         {
             this.rulesets = rulesets;
 
-            beatmaps = (BeatmapStore)ModelStore;
-            beatmaps.BeatmapHidden += b => BeatmapHidden?.Invoke(b);
-            beatmaps.BeatmapRestored += b => BeatmapRestored?.Invoke(b);
-            beatmaps.ItemRemoved += b => WorkingBeatmapCache?.Invalidate(b);
-            beatmaps.ItemUpdated += obj => WorkingBeatmapCache?.Invalidate(obj);
+            // beatmaps.BeatmapHidden += b => BeatmapHidden?.Invoke(b);
+            // beatmaps.BeatmapRestored += b => BeatmapRestored?.Invoke(b);
+            // beatmaps.ItemRemoved += b => WorkingBeatmapCache?.Invalidate(b);
+            // beatmaps.ItemUpdated += obj => WorkingBeatmapCache?.Invalidate(obj);
         }
 
         protected override bool ShouldDeleteArchive(string path) => Path.GetExtension(path)?.ToLowerInvariant() == ".osz";
 
-        protected override async Task Populate(BeatmapSetInfo beatmapSet, ArchiveReader archive, CancellationToken cancellationToken = default)
+        protected override async Task Populate(BeatmapSetInfo beatmapSet, ArchiveReader? archive, Realm realm, CancellationToken cancellationToken)
         {
             if (archive != null)
                 beatmapSet.Beatmaps.AddRange(createBeatmapDifficulties(beatmapSet.Files));
diff --git a/osu.Game/Beatmaps/BeatmapStore.cs b/osu.Game/Beatmaps/BeatmapStore.cs
deleted file mode 100644
index 197581db88..0000000000
--- a/osu.Game/Beatmaps/BeatmapStore.cs
+++ /dev/null
@@ -1,117 +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;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-using osu.Game.Database;
-
-namespace osu.Game.Beatmaps
-{
-    /// <summary>
-    /// Handles the storage and retrieval of Beatmaps/BeatmapSets to the database backing
-    /// </summary>
-    public class BeatmapStore : MutableDatabaseBackedStoreWithFileIncludes<BeatmapSetInfo, BeatmapSetFileInfo>
-    {
-        public event Action<BeatmapInfo> BeatmapHidden;
-        public event Action<BeatmapInfo> BeatmapRestored;
-
-        public BeatmapStore(IDatabaseContextFactory factory)
-            : base(factory)
-        {
-        }
-
-        /// <summary>
-        /// Hide a <see cref="BeatmapInfo"/> in the database.
-        /// </summary>
-        /// <param name="beatmapInfo">The beatmap to hide.</param>
-        /// <returns>Whether the beatmap's <see cref="BeatmapInfo.Hidden"/> was changed.</returns>
-        public bool Hide(BeatmapInfo beatmapInfo)
-        {
-            using (ContextFactory.GetForWrite())
-            {
-                Refresh(ref beatmapInfo, Beatmaps);
-
-                if (beatmapInfo.Hidden) return false;
-
-                beatmapInfo.Hidden = true;
-            }
-
-            BeatmapHidden?.Invoke(beatmapInfo);
-            return true;
-        }
-
-        /// <summary>
-        /// Restore a previously hidden <see cref="BeatmapInfo"/>.
-        /// </summary>
-        /// <param name="beatmapInfo">The beatmap to restore.</param>
-        /// <returns>Whether the beatmap's <see cref="BeatmapInfo.Hidden"/> was changed.</returns>
-        public bool Restore(BeatmapInfo beatmapInfo)
-        {
-            using (ContextFactory.GetForWrite())
-            {
-                Refresh(ref beatmapInfo, Beatmaps);
-
-                if (!beatmapInfo.Hidden) return false;
-
-                beatmapInfo.Hidden = false;
-            }
-
-            BeatmapRestored?.Invoke(beatmapInfo);
-            return true;
-        }
-
-        protected override IQueryable<BeatmapSetInfo> AddIncludesForDeletion(IQueryable<BeatmapSetInfo> query) =>
-            base.AddIncludesForDeletion(query)
-                .Include(s => s.Metadata)
-                .Include(s => s.Beatmaps).ThenInclude(b => b.BaseDifficulty)
-                .Include(s => s.Beatmaps).ThenInclude(b => b.Metadata);
-
-        protected override IQueryable<BeatmapSetInfo> AddIncludesForConsumption(IQueryable<BeatmapSetInfo> query) =>
-            base.AddIncludesForConsumption(query)
-                .Include(s => s.Metadata)
-                .Include(s => s.Beatmaps).ThenInclude(s => s.Ruleset)
-                .Include(s => s.Beatmaps).ThenInclude(b => b.BaseDifficulty)
-                .Include(s => s.Beatmaps).ThenInclude(b => b.Metadata);
-
-        protected override void Purge(List<BeatmapSetInfo> items, OsuDbContext context)
-        {
-            // metadata is M-N so we can't rely on cascades
-            context.BeatmapMetadata.RemoveRange(items.Select(s => s.Metadata));
-            context.BeatmapMetadata.RemoveRange(items.SelectMany(s => s.Beatmaps.Select(b => b.Metadata).Where(m => m != null)));
-
-            // todo: we can probably make cascades work here with a FK in BeatmapDifficulty. just make to make it work correctly.
-            context.BeatmapDifficulty.RemoveRange(items.SelectMany(s => s.Beatmaps.Select(b => b.BaseDifficulty)));
-
-            base.Purge(items, context);
-        }
-
-        public IQueryable<BeatmapSetInfo> BeatmapSetsOverview => ContextFactory.Get().BeatmapSetInfo
-                                                                               .Include(s => s.Metadata)
-                                                                               .Include(s => s.Beatmaps)
-                                                                               .AsNoTracking();
-
-        public IQueryable<BeatmapSetInfo> BeatmapSetsWithoutRuleset => ContextFactory.Get().BeatmapSetInfo
-                                                                                     .Include(s => s.Metadata)
-                                                                                     .Include(s => s.Files).ThenInclude(f => f.FileInfo)
-                                                                                     .Include(s => s.Beatmaps).ThenInclude(b => b.BaseDifficulty)
-                                                                                     .Include(s => s.Beatmaps).ThenInclude(b => b.Metadata)
-                                                                                     .AsNoTracking();
-
-        public IQueryable<BeatmapSetInfo> BeatmapSetsWithoutFiles => ContextFactory.Get().BeatmapSetInfo
-                                                                                   .Include(s => s.Metadata)
-                                                                                   .Include(s => s.Beatmaps).ThenInclude(s => s.Ruleset)
-                                                                                   .Include(s => s.Beatmaps).ThenInclude(b => b.BaseDifficulty)
-                                                                                   .Include(s => s.Beatmaps).ThenInclude(b => b.Metadata)
-                                                                                   .AsNoTracking();
-
-        public IQueryable<BeatmapInfo> Beatmaps =>
-            ContextFactory.Get().BeatmapInfo
-                          .Include(b => b.BeatmapSet).ThenInclude(s => s.Metadata)
-                          .Include(b => b.BeatmapSet).ThenInclude(s => s.Files).ThenInclude(f => f.FileInfo)
-                          .Include(b => b.Metadata)
-                          .Include(b => b.Ruleset)
-                          .Include(b => b.BaseDifficulty);
-    }
-}