diff --git a/osu.Game.Modes.Catch/CatchMod.cs b/osu.Game.Modes.Catch/CatchMod.cs
index 75b616a9ed..07d6d3469e 100644
--- a/osu.Game.Modes.Catch/CatchMod.cs
+++ b/osu.Game.Modes.Catch/CatchMod.cs
@@ -1,8 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-
 namespace osu.Game.Modes.Catch
 {
     public class CatchModNoFail : ModNoFail
diff --git a/osu.Game.Modes.Taiko/TaikoMod.cs b/osu.Game.Modes.Taiko/TaikoMod.cs
index fd09e4528e..62db875991 100644
--- a/osu.Game.Modes.Taiko/TaikoMod.cs
+++ b/osu.Game.Modes.Taiko/TaikoMod.cs
@@ -1,8 +1,6 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
-
 namespace osu.Game.Modes.Taiko
 {
     public class TaikoModNoFail : ModNoFail
diff --git a/osu.Game/Modes/Mod.cs b/osu.Game/Modes/Mod.cs
index 25fcad284a..d3286cd643 100644
--- a/osu.Game/Modes/Mod.cs
+++ b/osu.Game/Modes/Mod.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
-using System.ComponentModel;
 using osu.Game.Graphics;
 
 namespace osu.Game.Modes
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 99d6050591..95123d4106 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -9,7 +9,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Audio;
 using osu.Framework.Audio.Sample;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
@@ -111,14 +110,7 @@ public Mod Mod
                 if (mod == value) return;
                 mod = value;
 
-                if (mod is MultiMod)
-                {
-                    Mods = ((MultiMod)mod).Mods;
-                }
-                else
-                {
-                    Mods = new[] { mod };
-                }
+                Mods = (mod as MultiMod)?.Mods ?? new[] { mod };
 
                 createIcons();
                 if (Mods.Length > 0)