diff --git a/osu.Game/GameModes/GameModeWhiteBox.cs b/osu.Game/GameModes/GameModeWhiteBox.cs
index 08d65bec9f..3637fcdd3d 100644
--- a/osu.Game/GameModes/GameModeWhiteBox.cs
+++ b/osu.Game/GameModes/GameModeWhiteBox.cs
@@ -10,13 +10,12 @@ using osu.Framework.Graphics.Drawables;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.Containers;
 using OpenTK;
 using OpenTK.Graphics;
 
 namespace osu.Game.GameModes
 {
-    public class GameModeWhiteBox : OsuGameMode
+    public class GameModeWhiteBox : GameMode
     {
         private Button popButton;
 
diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs
index b3387ef3e5..671a08d2a0 100644
--- a/osu.Game/GameModes/Menu/ButtonSystem.cs
+++ b/osu.Game/GameModes/Menu/ButtonSystem.cs
@@ -19,7 +19,7 @@ using OpenTK.Input;
 
 namespace osu.Game.GameModes.Menu
 {
-    public class ButtonSystem : OsuLargeContainer
+    public class ButtonSystem : LargeContainer
     {
         public Action OnEdit;
         public Action OnExit;
@@ -272,7 +272,7 @@ namespace osu.Game.GameModes.Menu
         /// <summary>
         /// osu! logo and its attachments (pulsing, visualiser etc.)
         /// </summary>
-        class OsuLogo : OsuContainer
+        class OsuLogo : AutoSizeContainer
         {
             private Sprite logo;
             private Container logoBounceContainer;
@@ -392,7 +392,7 @@ namespace osu.Game.GameModes.Menu
         /// Button designed specifically for the osu!next main menu.
         /// In order to correctly flow, we have to use a negative margin on the parent container (due to the parallelogram shape).
         /// </summary>
-        private class Button : OsuContainer
+        private class Button : AutoSizeContainer
         {
             private Container iconText;
             private WedgedBox box;
diff --git a/osu.Game/GameModes/Menu/MainMenu.cs b/osu.Game/GameModes/Menu/MainMenu.cs
index 1983d4cd60..f12f6062b7 100644
--- a/osu.Game/GameModes/Menu/MainMenu.cs
+++ b/osu.Game/GameModes/Menu/MainMenu.cs
@@ -17,7 +17,7 @@ using OpenTK;
 
 namespace osu.Game.GameModes.Menu
 {
-    internal class MainMenu : OsuGameMode
+    internal class MainMenu : GameMode
     {
         private ButtonSystem buttons;
         public override string Name => @"Main Menu";
@@ -28,9 +28,13 @@ namespace osu.Game.GameModes.Menu
         {
             base.Load();
 
+            OsuGame osu = (OsuGame)Game;
+
             AudioSample welcome = Game.Audio.Sample.Get(@"welcome");
             welcome.Play();
 
+            //bgm = Game.Audio.Track.Get(@"circles");
+            //bgm.Start();
             Children = new Drawable[]
             {
                 new ParallaxContainer
@@ -52,7 +56,7 @@ namespace osu.Game.GameModes.Menu
                                 }, ButtonSystem.EXIT_DELAY);
                             },
                             OnSettings = delegate {
-                                Game.Options.PoppedOut = !Game.Options.PoppedOut;
+                                osu.Options.PoppedOut = !osu.Options.PoppedOut;
                             },
                         }
                     }
diff --git a/osu.Game/Graphics/Background/Background.cs b/osu.Game/Graphics/Background/Background.cs
index 28644f1185..13ce516559 100644
--- a/osu.Game/Graphics/Background/Background.cs
+++ b/osu.Game/Graphics/Background/Background.cs
@@ -7,10 +7,11 @@ using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics.Containers;
 using OpenTK;
 using OpenTK.Graphics;
+using osu.Framework.Graphics.Containers;
 
 namespace osu.Game.Graphics.Background
 {
-    class Background : OsuLargeContainer
+    class Background : LargeContainer
     {
         protected Sprite BackgroundSprite;
 
diff --git a/osu.Game/Graphics/Containers/OsuContainer.cs b/osu.Game/Graphics/Containers/OsuContainer.cs
deleted file mode 100644
index 9d7dbde298..0000000000
--- a/osu.Game/Graphics/Containers/OsuContainer.cs
+++ /dev/null
@@ -1,12 +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 osu.Framework.Graphics.Containers;
-
-namespace osu.Game.Graphics.Containers
-{
-    class OsuContainer : AutoSizeContainer
-    {
-        public new OsuGameBase Game => base.Game as OsuGameBase;
-    }
-}
diff --git a/osu.Game/Graphics/Containers/OsuGameMode.cs b/osu.Game/Graphics/Containers/OsuGameMode.cs
deleted file mode 100644
index d59d941ae5..0000000000
--- a/osu.Game/Graphics/Containers/OsuGameMode.cs
+++ /dev/null
@@ -1,12 +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 osu.Framework.GameModes;
-
-namespace osu.Game.Graphics.Containers
-{
-    public class OsuGameMode : GameMode
-    {
-        public new OsuGame Game => base.Game as OsuGame;
-    }
-}
diff --git a/osu.Game/Graphics/Containers/OsuLargeContainer.cs b/osu.Game/Graphics/Containers/OsuLargeContainer.cs
deleted file mode 100644
index df7a6ff9c2..0000000000
--- a/osu.Game/Graphics/Containers/OsuLargeContainer.cs
+++ /dev/null
@@ -1,12 +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 osu.Framework.Graphics.Containers;
-
-namespace osu.Game.Graphics.Containers
-{
-    public class OsuLargeContainer : LargeContainer
-    {
-        public new OsuGameBase Game => base.Game as OsuGameBase;
-    }
-}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 0541c58e83..26c3cd97e9 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -64,9 +64,6 @@
     <Compile Include="GameModes\Edit\SongSelectEdit.cs" />
     <Compile Include="Graphics\Background\Background.cs" />
     <Compile Include="Graphics\Containers\ParallaxContainer.cs" />
-    <Compile Include="Graphics\Containers\OsuContainer.cs" />
-    <Compile Include="Graphics\Containers\OsuGameMode.cs" />
-    <Compile Include="Graphics\Containers\OsuLargeContainer.cs" />
     <Compile Include="Graphics\Cursor\OsuCursorContainer.cs" />
     <Compile Include="Graphics\Processing\RatioAdjust.cs" />
     <Compile Include="Graphics\TextAwesome.cs" />