diff --git a/osu.Game.Rulesets.Mania/Timing/Drawables/DrawableManiaTimingChange.cs b/osu.Game.Rulesets.Mania/Timing/Drawables/DrawableManiaTimingChange.cs
index 8c19918689..44ceaa467d 100644
--- a/osu.Game.Rulesets.Mania/Timing/Drawables/DrawableManiaTimingChange.cs
+++ b/osu.Game.Rulesets.Mania/Timing/Drawables/DrawableManiaTimingChange.cs
@@ -9,7 +9,7 @@ namespace osu.Game.Rulesets.Mania.Timing.Drawables
 {
     public abstract class DrawableManiaTimingChange : DrawableTimingChange
     {
-        public DrawableManiaTimingChange(TimingChange timingChange)
+        protected DrawableManiaTimingChange(TimingChange timingChange)
             : base(timingChange, Axes.Y)
         {
         }
diff --git a/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
index c8b845eb9a..e69802f784 100644
--- a/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
+++ b/osu.Game.Rulesets.Mania/UI/ManiaHitRenderer.cs
@@ -65,10 +65,10 @@ private void generateDefaultTimingChanges()
             if (HitObjectTimingChanges != null || BarlineTimingChanges != null)
                 return;
 
-            HitObjectTimingChanges = new List<DrawableTimingChange>[Columns.Value];
+            HitObjectTimingChanges = new List<DrawableTimingChange>[PreferredColumns];
             BarlineTimingChanges = new List<DrawableTimingChange>();
 
-            for (int i = 0; i < Columns.Value; i++)
+            for (int i = 0; i < PreferredColumns; i++)
                 HitObjectTimingChanges[i] = new List<DrawableTimingChange>();
 
             double lastSpeedMultiplier = 1;
@@ -113,7 +113,7 @@ private void generateDefaultTimingChanges()
 
             timingChanges.ForEach(t =>
             {
-                for (int i = 0; i < Columns.Value; i++)
+                for (int i = 0; i < PreferredColumns; i++)
                     HitObjectTimingChanges[i].Add(new DrawableManiaScrollingTimingChange(t));
 
                 BarlineTimingChanges.Add(new DrawableManiaScrollingTimingChange(t));
@@ -128,7 +128,7 @@ protected override void ApplyBeatmap()
 
         protected override Playfield<ManiaHitObject, ManiaJudgement> CreatePlayfield()
         {
-            var playfield = new ManiaPlayfield(Columns.Value)
+            var playfield = new ManiaPlayfield(PreferredColumns)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
@@ -136,7 +136,7 @@ protected override Playfield<ManiaHitObject, ManiaJudgement> CreatePlayfield()
                 Scale = new Vector2(1, -1)
             };
 
-            for (int i = 0; i < Columns; i++)
+            for (int i = 0; i < PreferredColumns; i++)
             {
                 foreach (var change in HitObjectTimingChanges[i])
                     playfield.Columns.ElementAt(i).Add(change);
diff --git a/osu.Game/Rulesets/Timing/IHasTimeSpan.cs b/osu.Game/Rulesets/Timing/IHasTimeSpan.cs
index 0434ffc3b4..66c31515a9 100644
--- a/osu.Game/Rulesets/Timing/IHasTimeSpan.cs
+++ b/osu.Game/Rulesets/Timing/IHasTimeSpan.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics.Containers;
-using OpenTK;
 
 namespace osu.Game.Rulesets.Timing
 {
diff --git a/osu.Game/Rulesets/Timing/TimingChangeContainer.cs b/osu.Game/Rulesets/Timing/TimingChangeContainer.cs
index b488fd702c..8758493145 100644
--- a/osu.Game/Rulesets/Timing/TimingChangeContainer.cs
+++ b/osu.Game/Rulesets/Timing/TimingChangeContainer.cs
@@ -8,7 +8,6 @@
 using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Timing.Drawables;
-using OpenTK;
 
 namespace osu.Game.Rulesets.Timing
 {