diff --git a/osu.Game/Beatmaps/BeatmapSet.cs b/osu.Game/Beatmaps/BeatmapSet.cs
deleted file mode 100644
index 55c888384f..0000000000
--- a/osu.Game/Beatmaps/BeatmapSet.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.Collections.Generic;
-using osu.Game.Database;
-using osu.Game.Users;
-
-namespace osu.Game.Beatmaps
-{
-    /// <summary>
-    /// A beatmap set contains multiple beatmap (difficulties).
-    /// </summary>
-    public class BeatmapSet
-    {
-        public BeatmapSetInfo BeatmapSetInfo { get; set; }
-        public List<Beatmap> Beatmaps { get; protected set; } = new List<Beatmap>();
-        public User Creator { get; set; }
-    }
-}
diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index 7b3b741b50..73809c6fc2 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -82,6 +82,11 @@ namespace osu.Game.Database
             return ArchiveReader.GetReader(storage, beatmapSet.Path);
         }
         
+        public BeatmapSetInfo GetBeatmapSet(int id)
+        {
+            return Query<BeatmapSetInfo>().Where(s => s.BeatmapSetID == id).FirstOrDefault();
+        }
+        
         public Beatmap GetBeatmap(BeatmapInfo beatmapInfo)
         {
             var beatmapSet = Query<BeatmapSetInfo>()
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 14b61c218f..8f029070ca 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -61,7 +61,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Beatmaps\Beatmap.cs" />
-    <Compile Include="Beatmaps\BeatmapSet.cs" />
     <Compile Include="Beatmaps\Objects\Catch\CatchConverter.cs" />
     <Compile Include="Beatmaps\Objects\Catch\Drawable\DrawableFruit.cs" />
     <Compile Include="Beatmaps\Objects\HitObject.cs" />