diff --git a/osu.Game.Rulesets.Osu/Mods/OsuMod.cs b/osu.Game.Rulesets.Osu/Mods/OsuMod.cs
index 3f9bfc0f41..bd2f8090ed 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuMod.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuMod.cs
@@ -70,14 +70,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     break;
                 case DrawableSlider slider:
                     using (slider.BeginAbsoluteSequence(fadeOutStartTime, true))
-                    {
                         slider.Body.FadeOut(longFadeDuration, Easing.Out);
-
-                        // delay a bit less to let the sliderball fade out peacefully instead of having a hard cut
-                        using (slider.BeginDelayedSequence(longFadeDuration - fadeOutDuration, true))
-                            slider.Ball.FadeOut(fadeOutDuration);
-                    }
-
                     break;
                 case DrawableSpinner spinner:
                     // hide elements we don't care about.
@@ -86,23 +79,7 @@ namespace osu.Game.Rulesets.Osu.Mods
                     spinner.Background.Hide();
 
                     using (spinner.BeginAbsoluteSequence(fadeOutStartTime + longFadeDuration, true))
-                    {
                         spinner.FadeOut(fadeOutDuration);
-
-                        // speed up the end sequence accordingly
-                        switch (state)
-                        {
-                            case ArmedState.Hit:
-                                spinner.ScaleTo(spinner.Scale * 1.2f, fadeOutDuration * 2, Easing.Out);
-                                break;
-                            case ArmedState.Miss:
-                                spinner.ScaleTo(spinner.Scale * 0.8f, fadeOutDuration * 2, Easing.In);
-                                break;
-                        }
-
-                        spinner.Expire();
-                    }
-
                     break;
             }
         }
diff --git a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
index 6c0301f01f..6be6523175 100644
--- a/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
@@ -93,7 +93,8 @@ namespace osu.Game.Screens.Select.Leaderboards
             get { return scope; }
             set
             {
-                if (value == scope) return;
+                if (value == scope)
+                    return;
 
                 scope = value;
                 updateScores();
@@ -107,8 +108,6 @@ namespace osu.Game.Screens.Select.Leaderboards
             get { return placeholderState; }
             set
             {
-                if (value == placeholderState) return;
-
                 if (value != PlaceholderState.Successful)
                 {
                     getScoresRequest?.Cancel();
@@ -116,6 +115,9 @@ namespace osu.Game.Screens.Select.Leaderboards
                     Scores = null;
                 }
 
+                if (value == placeholderState)
+                    return;
+
                 switch (placeholderState = value)
                 {
                     case PlaceholderState.NetworkFailure:
@@ -171,7 +173,8 @@ namespace osu.Game.Screens.Select.Leaderboards
             get { return beatmap; }
             set
             {
-                if (beatmap == value) return;
+                if (beatmap == value)
+                    return;
 
                 beatmap = value;
                 Scores = null;
@@ -259,7 +262,8 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         private void onUpdateFailed(Exception e)
         {
-            if (e is OperationCanceledException) return;
+            if (e is OperationCanceledException)
+                return;
 
             PlaceholderState = PlaceholderState.NetworkFailure;
             Logger.Error(e, @"Couldn't fetch beatmap scores!");
@@ -294,7 +298,8 @@ namespace osu.Game.Screens.Select.Leaderboards
             if (!scrollContainer.IsScrolledToEnd())
                 fadeStart -= LeaderboardScore.HEIGHT;
 
-            if (scrollFlow == null) return;
+            if (scrollFlow == null)
+                return;
 
             foreach (var c in scrollFlow.Children)
             {