Clean up unused resolved properties

osu.Game.Rulesets.Mania/Edit/ManiaBeatSnapGrid.cs

@@ -9,7 +9,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.UI;
@@ -46,12 +45,6 @@ namespace osu.Game.Rulesets.Mania.Edit
         [Resolved]
         private EditorBeatmap beatmap { get; set; }
 
-        [Resolved]
-        private IScrollingInfo scrollingInfo { get; set; }
-
-        [Resolved]
-        private Bindable<WorkingBeatmap> working { get; set; }
-
         [Resolved]
         private OsuColour colours { get; set; }
 

osu.Game.Rulesets.Mania/Edit/ManiaSelectionHandler.cs

@@ -7,16 +7,12 @@ using osu.Framework.Allocation;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.UI.Scrolling;
 using osu.Game.Screens.Edit.Compose.Components;
 
 namespace osu.Game.Rulesets.Mania.Edit
 {
     public class ManiaSelectionHandler : EditorSelectionHandler
     {
-        [Resolved]
-        private IScrollingInfo scrollingInfo { get; set; }
-
         [Resolved]
         private HitObjectComposer composer { get; set; }
 

osu.Game.Rulesets.Mania/UI/PoolableHitExplosion.cs

@@ -15,9 +15,6 @@ namespace osu.Game.Rulesets.Mania.UI
 
         public JudgementResult Result { get; private set; }
 
-        [Resolved]
-        private Column column { get; set; }
-
         private SkinnableDrawable skinnableExplosion;
 
         public PoolableHitExplosion()

osu.Game.Rulesets.Taiko/UI/InputDrum.cs

@@ -12,7 +12,6 @@ using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.UI;
-using osu.Game.Screens.Play;
 using osu.Game.Skinning;
 using osuTK;
 
@@ -149,9 +148,6 @@ namespace osu.Game.Rulesets.Taiko.UI
                 centreHit.Colour = colours.Pink;
             }
 
-            [Resolved(canBeNull: true)]
-            private GameplayClock gameplayClock { get; set; }
-
             public bool OnPressed(KeyBindingPressEvent<TaikoAction> e)
             {
                 Drawable target = null;

osu.Game.Tests/Beatmaps/TestSceneBeatmapDifficultyCache.cs

@@ -25,9 +25,6 @@ namespace osu.Game.Tests.Beatmaps
 
         private BeatmapSetInfo importedSet;
 
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
         private TestBeatmapDifficultyCache difficultyCache;
 
         private IBindable<StarDifficulty?> starDifficultyBindable;

osu.Game.Tests/Input/ConfineMouseTrackerTest.cs

@@ -18,9 +18,6 @@ namespace osu.Game.Tests.Input
         [Resolved]
         private FrameworkConfigManager frameworkConfigManager { get; set; }
 
-        [Resolved]
-        private OsuConfigManager osuConfigManager { get; set; }
-
         [TestCase(WindowMode.Windowed)]
         [TestCase(WindowMode.Borderless)]
         public void TestDisableConfining(WindowMode windowMode)

osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditor.cs

@@ -2,12 +2,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
-using osu.Game.Skinning;
 using osu.Game.Skinning.Editor;
 
 namespace osu.Game.Tests.Visual.Gameplay
@@ -16,9 +14,6 @@ namespace osu.Game.Tests.Visual.Gameplay
     {
         private SkinEditor skinEditor;
 
-        [Resolved]
-        private SkinManager skinManager { get; set; }
-
         protected override bool Autoplay => true;
 
         [SetUpSteps]

osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs

@@ -10,7 +10,6 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
-using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Osu;
@@ -36,9 +35,6 @@ namespace osu.Game.Tests.Visual.Gameplay
         private Drawable hideTarget => hudOverlay.KeyCounter;
         private FillFlowContainer<KeyCounter> keyCounterFlow => hudOverlay.KeyCounter.ChildrenOfType<FillFlowContainer<KeyCounter>>().First();
 
-        [Resolved]
-        private OsuConfigManager config { get; set; }
-
         [Test]
         public void TestComboCounterIncrementing()
         {

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapDetailArea.cs

@@ -2,11 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using NUnit.Framework;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Screens.OnlinePlay.Components;
@@ -18,12 +15,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestSceneMatchBeatmapDetailArea : OnlinePlayTestScene
     {
-        [Resolved]
-        private BeatmapManager beatmapManager { get; set; }
-
-        [Resolved]
-        private RulesetStore rulesetStore { get; set; }
-
         [SetUp]
         public new void Setup() => Schedule(() =>
         {

osu.Game.Tests/Visual/Multiplayer/TestScenePlaylistsSongSelect.cs

@@ -24,9 +24,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
 {
     public class TestScenePlaylistsSongSelect : OnlinePlayTestScene
     {
-        [Resolved]
-        private BeatmapManager beatmapManager { get; set; }
-
         private BeatmapManager manager;
 
         private RulesetStore rulesets;

osu.Game.Tests/Visual/Navigation/TestSceneOsuGame.cs

@@ -83,9 +83,6 @@ namespace osu.Game.Tests.Visual.Navigation
         [Resolved]
         private OsuGameBase gameBase { get; set; }
 
-        [Resolved]
-        private GameHost host { get; set; }
-
         [Test]
         public void TestNullRulesetHandled()
         {

osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs

@@ -13,7 +13,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
-using osu.Framework.Platform;
 using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API;
@@ -47,9 +46,6 @@ namespace osu.Game.Tests.Visual.Online
         [CanBeNull]
         private Func<Channel, List<Message>> onGetMessages;
 
-        [Resolved]
-        private GameHost host { get; set; }
-
         public TestSceneChatOverlay()
         {
             channels = Enumerable.Range(1, 10)

osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs

@@ -4,8 +4,6 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Game.Online.API;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Profile;
@@ -20,9 +18,6 @@ namespace osu.Game.Tests.Visual.Online
 
         private readonly TestUserProfileOverlay profile;
 
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
         public static readonly APIUser TEST_USER = new APIUser
         {
             Username = @"Somebody",

osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs

@@ -9,7 +9,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Beatmaps;
-using osu.Game.Rulesets;
 using osu.Game.Rulesets.Osu;
 using osu.Game.Scoring;
 using osu.Game.Screens.Ranking;
@@ -20,9 +19,6 @@ namespace osu.Game.Tests.Visual.Ranking
 {
     public class TestSceneContractedPanelMiddleContent : OsuTestScene
     {
-        [Resolved]
-        private RulesetStore rulesetStore { get; set; }
-
         [Test]
         public void TestShowPanel()
         {

osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapBackgroundSprite.cs

@@ -26,9 +26,6 @@ namespace osu.Game.Tests.Visual.UserInterface
         private BeatmapSetInfo testBeatmap;
         private IAPIProvider api;
 
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
         [BackgroundDependencyLoader]
         private void load(OsuGameBase osu, IAPIProvider api, RulesetStore rulesets)
         {

osu.Game.Tournament.Tests/Components/TestSceneTournamentBeatmapPanel.cs

@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Rulesets;
 using osu.Game.Tournament.Components;
 
 namespace osu.Game.Tournament.Tests.Components
@@ -16,9 +15,6 @@ namespace osu.Game.Tournament.Tests.Components
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         [BackgroundDependencyLoader]
         private void load()
         {

osu.Game.Tournament/Screens/Editors/SeedingEditorScreen.cs

@@ -25,9 +25,6 @@ namespace osu.Game.Tournament.Screens.Editors
 
         protected override BindableList<SeedingResult> Storage => team.SeedingResults;
 
-        [Resolved(canBeNull: true)]
-        private TournamentSceneManager sceneManager { get; set; }
-
         public SeedingEditorScreen(TournamentTeam team, TournamentScreen parentScreen)
             : base(parentScreen)
         {
@@ -38,9 +35,6 @@ namespace osu.Game.Tournament.Screens.Editors
         {
             public SeedingResult Model { get; }
 
-            [Resolved]
-            private LadderInfo ladderInfo { get; set; }
-
             public SeedingResultRow(TournamentTeam team, SeedingResult round)
             {
                 Model = round;

osu.Game.Tournament/Screens/Setup/StablePathSelectScreen.cs

@@ -21,9 +21,6 @@ namespace osu.Game.Tournament.Screens.Setup
 {
     public class StablePathSelectScreen : TournamentScreen
     {
-        [Resolved]
-        private GameHost host { get; set; }
-
         [Resolved(canBeNull: true)]
         private TournamentSceneManager sceneManager { get; set; }
 

osu.Game/Audio/PreviewTrackManager.cs

@@ -18,9 +18,6 @@ namespace osu.Game.Audio
 
         private readonly BindableDouble muteBindable = new BindableDouble();
 
-        [Resolved]
-        private AudioManager audio { get; set; }
-
         private ITrackStore trackStore;
 
         protected TrackManagerPreviewTrack CurrentTrack;

osu.Game/Collections/CollectionFilterDropdown.cs

@@ -13,7 +13,6 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
@@ -193,9 +192,6 @@ namespace osu.Game.Collections
             [NotNull]
             protected new CollectionFilterMenuItem Item => ((DropdownMenuItem<CollectionFilterMenuItem>)base.Item).Value;
 
-            [Resolved]
-            private OsuColour colours { get; set; }
-
             [Resolved]
             private IBindable<WorkingBeatmap> beatmap { get; set; }
 

osu.Game/Collections/CollectionManager.cs

@@ -40,9 +40,6 @@ namespace osu.Game.Collections
 
         public readonly BindableList<BeatmapCollection> Collections = new BindableList<BeatmapCollection>();
 
-        [Resolved]
-        private GameHost host { get; set; }
-
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 

osu.Game/Online/Leaderboards/LeaderboardScore.cs

@@ -65,9 +65,6 @@ namespace osu.Game.Online.Leaderboards
         [Resolved(CanBeNull = true)]
         private SongSelect songSelect { get; set; }
 
-        [Resolved]
-        private ScoreManager scoreManager { get; set; }
-
         [Resolved]
         private Storage storage { get; set; }
 

osu.Game/Online/Leaderboards/UserTopScoreContainer.cs

@@ -3,13 +3,11 @@
 
 using System;
 using System.Threading;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Rulesets;
 using osuTK;
 
 namespace osu.Game.Online.Leaderboards
@@ -25,9 +23,6 @@ namespace osu.Game.Online.Leaderboards
 
         protected override bool StartHidden => true;
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         public UserTopScoreContainer(Func<TScoreInfo, LeaderboardScore> createScoreDelegate)
         {
             this.createScoreDelegate = createScoreDelegate;

osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs

@@ -15,7 +15,6 @@ using osu.Framework.Threading;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Rulesets;
 using osu.Game.Resources.Localisation.Web;
 using osuTK;
 using osuTK.Graphics;
@@ -61,9 +60,6 @@ namespace osu.Game.Overlays.BeatmapListing
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         public BeatmapListingFilterControl()
         {
             RelativeSizeAxes = Axes.X;

osu.Game/Overlays/BeatmapSetOverlay.cs

@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -12,7 +11,6 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Overlays.BeatmapSet;
 using osu.Game.Overlays.BeatmapSet.Scores;
 using osu.Game.Overlays.Comments;
-using osu.Game.Rulesets;
 using osuTK;
 using osuTK.Graphics;
 
@@ -24,9 +22,6 @@ namespace osu.Game.Overlays
         public const float Y_PADDING = 25;
         public const float RIGHT_WIDTH = 275;
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         private readonly Bindable<APIBeatmapSet> beatmapSet = new Bindable<APIBeatmapSet>();
 
         // receive input outside our bounds so we can trigger a close event on ourselves.

osu.Game/Overlays/Dashboard/CurrentlyPlayingDisplay.cs

@@ -43,9 +43,6 @@ namespace osu.Game.Overlays.Dashboard
             };
         }
 
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
         [Resolved]
         private UserLookupCache users { get; set; }
 

osu.Game/Overlays/Rankings/SpotlightsLayout.cs

@@ -29,9 +29,6 @@ namespace osu.Game.Overlays.Rankings
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         private CancellationTokenSource cancellationToken;
         private GetSpotlightRankingsRequest getRankingsRequest;
         private GetSpotlightsRequest spotlightsRequest;

osu.Game/Overlays/Wiki/Markdown/WikiMarkdownContainer.cs

@@ -5,19 +5,14 @@ using System.Linq;
 using Markdig.Extensions.Yaml;
 using Markdig.Syntax;
 using Markdig.Syntax.Inlines;
-using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Containers.Markdown;
 using osu.Game.Graphics.Containers.Markdown;
-using osu.Game.Online.API;
 
 namespace osu.Game.Overlays.Wiki.Markdown
 {
     public class WikiMarkdownContainer : OsuMarkdownContainer
     {
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
         public string CurrentPath
         {
             set => DocumentUrl = value;

osu.Game/Rulesets/UI/Playfield.cs

@@ -19,7 +19,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Skinning;
 using osuTK;
 using System.Diagnostics;
-using osu.Framework.Audio.Sample;
 
 namespace osu.Game.Rulesets.UI
 {
@@ -88,9 +87,6 @@ namespace osu.Game.Rulesets.UI
         [Resolved(CanBeNull = true)]
         private IReadOnlyList<Mod> mods { get; set; }
 
-        [Resolved]
-        private ISampleStore sampleStore { get; set; }
-
         /// <summary>
         /// Creates a new <see cref="Playfield"/>.
         /// </summary>

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/GroupVisualisation.cs

@@ -1,20 +1,15 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 
 namespace osu.Game.Screens.Edit.Components.Timelines.Summary.Parts
 {
     public class GroupVisualisation : CompositeDrawable
     {
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         public readonly ControlPointGroup Group;
 
         private readonly IBindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>();

osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs

@@ -279,9 +279,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                 editorClock.Start();
         }
 
-        [Resolved]
-        private EditorBeatmap beatmap { get; set; }
-
         [Resolved]
         private IBeatSnapProvider beatSnapProvider { get; set; }
 

osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointGroup.cs

@@ -1,12 +1,10 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Graphics;
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
@@ -16,9 +14,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
         private readonly IBindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>();
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         public TimelineControlPointGroup(ControlPointGroup group)
         {
             Group = group;

osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs

@@ -184,9 +184,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private SamplePointPiece sampleOverrideDisplay;
         private DifficultyPointPiece difficultyOverrideDisplay;
 
-        [Resolved]
-        private EditorBeatmap beatmap { get; set; }
-
         private DifficultyControlPoint difficultyControlPoint;
         private SampleControlPoint sampleControlPoint;
 

osu.Game/Screens/Edit/Editor.cs

@@ -109,9 +109,6 @@ namespace osu.Game.Screens.Edit
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private MusicController music { get; set; }
-
         [Cached]
         public readonly EditorClipboard Clipboard = new EditorClipboard();
 

osu.Game/Screens/Edit/EditorRoundedScreen.cs

@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
-using osu.Game.Graphics;
 using osu.Game.Overlays;
 
 namespace osu.Game.Screens.Edit
@@ -14,9 +13,6 @@ namespace osu.Game.Screens.Edit
     {
         public const int HORIZONTAL_PADDING = 100;
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         private Container roundedContent;
 
         protected override Container<Drawable> Content => roundedContent;

osu.Game/Screens/Edit/EditorTable.cs

@@ -62,9 +62,6 @@ namespace osu.Game.Screens.Edit
 
             private readonly Box hoveredBackground;
 
-            [Resolved]
-            private EditorClock clock { get; set; }
-
             public RowBackground(object item)
             {
                 Item = item;

osu.Game/Screens/Edit/Setup/FileChooserLabelledTextBox.cs

@@ -15,7 +15,6 @@ using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Game.Database;
-using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
 using osuTK;
@@ -36,9 +35,6 @@ namespace osu.Game.Screens.Edit.Setup
         [Resolved]
         private OsuGameBase game { get; set; }
 
-        [Resolved]
-        private SectionsContainer<SetupSection> sectionsContainer { get; set; }
-
         public FileChooserLabelledTextBox(params string[] handledExtensions)
         {
             this.handledExtensions = handledExtensions;

osu.Game/Screens/Edit/Timing/ControlPointTable.cs

@@ -132,9 +132,6 @@ namespace osu.Game.Screens.Edit.Timing
                 controlPoints.BindTo(group.ControlPoints);
             }
 
-            [Resolved]
-            private OsuColour colours { get; set; }
-
             [BackgroundDependencyLoader]
             private void load()
             {

osu.Game/Screens/Edit/Verify/IssueList.cs

@@ -23,9 +23,6 @@ namespace osu.Game.Screens.Edit.Verify
     {
         private IssueTable table;
 
-        [Resolved]
-        private EditorClock clock { get; set; }
-
         [Resolved]
         private IBindable<WorkingBeatmap> workingBeatmap { get; set; }
 

osu.Game/Screens/Menu/StorageErrorDialog.cs

@@ -15,9 +15,6 @@ namespace osu.Game.Screens.Menu
         [Resolved]
         private DialogOverlay dialogOverlay { get; set; }
 
-        [Resolved]
-        private OsuGameBase osuGame { get; set; }
-
         public StorageErrorDialog(OsuStorage storage, OsuStorageError error)
         {
             HeaderText = "osu! storage error";

osu.Game/Screens/OnlinePlay/Components/RoomManager.cs

@@ -9,7 +9,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Logging;
-using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
@@ -30,9 +29,6 @@ namespace osu.Game.Screens.OnlinePlay.Components
         [Resolved]
         private RulesetStore rulesets { get; set; }
 
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
         [Resolved]
         private IAPIProvider api { get; set; }
 

osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs

@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Threading.Tasks;
-using osu.Framework.Allocation;
 using osu.Game.Online.Rooms;
 
 namespace osu.Game.Screens.OnlinePlay.Components
@@ -12,9 +11,6 @@ namespace osu.Game.Screens.OnlinePlay.Components
     /// </summary>
     public class SelectionPollingComponent : RoomPollingComponent
     {
-        [Resolved]
-        private IRoomManager roomManager { get; set; }
-
         private readonly Room room;
 
         public SelectionPollingComponent(Room room)

osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs

@@ -30,9 +30,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 
         public readonly Room Room;
 
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
         protected Container ButtonsContainer { get; private set; }
 
         private readonly Bindable<MatchType> roomType = new Bindable<MatchType>();

osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs

@@ -33,9 +33,6 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         [Resolved]
         private IRoomManager roomManager { get; set; }
 
-        [Resolved(CanBeNull = true)]
-        private LoungeSubScreen loungeSubScreen { get; set; }
-
         // handle deselection
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
 

osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs

@@ -12,7 +12,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Screens;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;
@@ -20,7 +19,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Overlays;
-using osu.Game.Rulesets;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osuTK;
 
@@ -84,12 +82,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             [Resolved]
             private MultiplayerClient client { get; set; }
 
-            [Resolved]
-            private Bindable<WorkingBeatmap> beatmap { get; set; }
-
-            [Resolved]
-            private Bindable<RulesetInfo> ruleset { get; set; }
-
             [Resolved]
             private OngoingOperationTracker ongoingOperationTracker { get; set; }
 

osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs

@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
-using osu.Game.Online.API;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Components;
 using osuTK;
@@ -25,9 +24,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
             set => button.Action = value;
         }
 
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
         [Resolved]
         private OsuColour colours { get; set; }
 

osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs

@@ -36,9 +36,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
         [Resolved]
         private OsuColour colours { get; set; }
 
-        [Resolved]
-        private SpectatorClient spectatorClient { get; set; }
-
         [Resolved]
         private MultiplayerClient multiplayerClient { get; set; }
 

osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs

@@ -40,18 +40,9 @@ namespace osu.Game.Screens.OnlinePlay
         [Cached]
         private readonly OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
 
-        [Resolved(CanBeNull = true)]
-        private MusicController music { get; set; }
-
-        [Resolved]
-        private OsuGameBase game { get; set; }
-
         [Resolved]
         protected IAPIProvider API { get; private set; }
 
-        [Resolved(CanBeNull = true)]
-        private OsuLogo logo { get; set; }
-
         protected OnlinePlayScreen()
         {
             Anchor = Anchor.Centre;

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs

@@ -11,7 +11,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Input;
-using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.OnlinePlay.Match;
@@ -29,9 +28,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         public override string ShortTitle => "playlist";
 
-        [Resolved]
-        private IAPIProvider api { get; set; }
-
         private readonly IBindable<bool> isIdle = new BindableBool();
 
         private MatchLeaderboard leaderboard;

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsSongSelect.cs

@@ -2,9 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using osu.Framework.Allocation;
 using osu.Framework.Screens;
-using osu.Game.Beatmaps;
 using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Components;
 using osu.Game.Screens.Select;
@@ -13,9 +11,6 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsSongSelect : OnlinePlaySongSelect
     {
-        [Resolved]
-        private BeatmapManager beatmaps { get; set; }
-
         public PlaylistsSongSelect(Room room)
             : base(room)
         {

osu.Game/Screens/Play/HUD/DefaultAccuracyCounter.cs

@@ -9,9 +9,6 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class DefaultAccuracyCounter : GameplayAccuracyCounter, ISkinnableDrawable
     {
-        [Resolved(canBeNull: true)]
-        private HUDOverlay hud { get; set; }
-
         public bool UsesFixedAnchor { get; set; }
 
         [BackgroundDependencyLoader]

osu.Game/Screens/Play/HUD/DefaultComboCounter.cs

@@ -15,9 +15,6 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class DefaultComboCounter : RollingCounter<int>, ISkinnableDrawable
     {
-        [Resolved(canBeNull: true)]
-        private HUDOverlay hud { get; set; }
-
         public bool UsesFixedAnchor { get; set; }
 
         public DefaultComboCounter()

osu.Game/Screens/Play/HUD/DefaultScoreCounter.cs

@@ -16,9 +16,6 @@ namespace osu.Game.Screens.Play.HUD
             Origin = Anchor.TopCentre;
         }
 
-        [Resolved(canBeNull: true)]
-        private HUDOverlay hud { get; set; }
-
         public bool UsesFixedAnchor { get; set; }
 
         [BackgroundDependencyLoader]

osu.Game/Screens/Play/HUD/LegacyComboCounter.cs

@@ -40,9 +40,6 @@ namespace osu.Game.Screens.Play.HUD
 
         private bool isRolling;
 
-        [Resolved]
-        private ISkinSource skin { get; set; }
-
         private readonly Container counterContainer;
 
         /// <summary>

osu.Game/Screens/Play/SoloSpectator.cs

@@ -23,7 +23,6 @@ using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Spectator;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Settings;
-using osu.Game.Rulesets;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.Spectate;
 using osu.Game.Users;
@@ -44,9 +43,6 @@ namespace osu.Game.Screens.Play
         [Resolved]
         private PreviewTrackManager previewTrackManager { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 

osu.Game/Screens/Ranking/ScorePanelList.cs

@@ -13,7 +13,6 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Events;
-using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Scoring;
 using osuTK;
@@ -70,9 +69,6 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private ScoreManager scoreManager { get; set; }
 
-        [Resolved]
-        private BeatmapDifficultyCache difficultyCache { get; set; }
-
         private readonly CancellationTokenSource loadCancellationSource = new CancellationTokenSource();
         private readonly Flow flow;
         private readonly Scroll scroll;

osu.Game/Screens/Select/BeatmapDetails.cs

@@ -16,7 +16,6 @@ using osu.Game.Online;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.BeatmapSet;
-using osu.Game.Rulesets;
 using osu.Game.Screens.Select.Details;
 using osuTK;
 using osuTK.Graphics;
@@ -38,9 +37,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        [Resolved]
-        private RulesetStore rulesets { get; set; }
-
         private IBeatmapInfo beatmapInfo;
 
         private APIFailTimes failTimes;

osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs

@@ -64,9 +64,6 @@ namespace osu.Game.Screens.Select.Leaderboards
         [Resolved]
         private ScoreManager scoreManager { get; set; }
 
-        [Resolved]
-        private BeatmapDifficultyCache difficultyCache { get; set; }
-
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 

osu.Game/Skinning/Editor/SkinEditorOverlay.cs

@@ -3,13 +3,11 @@
 
 using System.Diagnostics;
 using JetBrains.Annotations;
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Input.Bindings;
 
@@ -28,9 +26,6 @@ namespace osu.Game.Skinning.Editor
 
         public const float VISIBLE_TARGET_SCALE = 0.8f;
 
-        [Resolved]
-        private OsuColour colours { get; set; }
-
         public SkinEditorOverlay(ScalingContainer target)
         {
             this.target = target;

osu.Game/Skinning/LegacyAccuracyCounter.cs

@@ -1,10 +1,8 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 
@@ -23,9 +21,6 @@ namespace osu.Game.Skinning
             Margin = new MarginPadding(10);
         }
 
-        [Resolved(canBeNull: true)]
-        private HUDOverlay hud { get; set; }
-
         protected sealed override OsuSpriteText CreateSpriteText() => new LegacySpriteText(LegacyFont.Score)
         {
             Anchor = Anchor.TopRight,

osu.Game/Skinning/PoolableSkinnableSample.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using JetBrains.Annotations;
-using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
@@ -30,9 +29,6 @@ namespace osu.Game.Skinning
         private ISampleInfo sampleInfo;
         private SampleChannel activeChannel;
 
-        [Resolved]
-        private ISampleStore sampleStore { get; set; }
-
         /// <summary>
         /// Creates a new <see cref="PoolableSkinnableSample"/> with no applied <see cref="ISampleInfo"/>.
         /// An <see cref="ISampleInfo"/> can be applied later via <see cref="Apply"/>.

osu.Game/Skinning/SkinnableSound.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
@@ -43,9 +42,6 @@ namespace osu.Game.Skinning
 
         private readonly AudioContainer<PoolableSkinnableSample> samplesContainer;
 
-        [Resolved]
-        private ISampleStore sampleStore { get; set; }
-
         [Resolved(CanBeNull = true)]
         private IPooledSampleProvider samplePool { get; set; }
 

osu.Game/Updater/NoActionUpdateManager.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Platform;
 using osu.Game.Online.API;
 using osu.Game.Overlays.Notifications;
 
@@ -19,9 +18,6 @@ namespace osu.Game.Updater
     {
         private string version;
 
-        [Resolved]
-        private GameHost host { get; set; }
-
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game)
         {