diff --git a/osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs b/osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
index 3aa88af62d..e3045df185 100644
--- a/osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
+++ b/osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 yield break;
             }
 
-            IEnumerable<ManiaHitObject> objects = null;
+            IEnumerable<ManiaHitObject> objects;
             switch (beatmap.BeatmapInfo.RulesetID)
             {
                 default:
@@ -74,7 +74,9 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
             var distanceData = original as IHasDistance;
             var positionData = original as IHasPosition;
 
-            PatternGenerator conversion = null;
+            // Following lines currently commented out to appease resharper
+
+            //PatternGenerator conversion = null;
 
             if (distanceData != null)
             {
@@ -89,13 +91,13 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 // Circle
             }
 
-            if (conversion == null)
-                return new ManiaHitObject[0];
+            //if (conversion == null)
+                return null;
 
-            Pattern newPattern = conversion.Generate();
-            lastPattern = newPattern;
+            //Pattern newPattern = conversion.Generate();
+            //lastPattern = newPattern;
 
-            return newPattern.HitObjects;
+            //return newPattern.HitObjects;
         }
 
         /// <summary>
@@ -113,6 +115,8 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                 var endTimeData = HitObject as IHasEndTime;
                 var positionData = HitObject as IHasXPosition;
 
+                int column = GetColumn(positionData?.X ?? 0);
+
                 var pattern = new Pattern();
 
                 if (endTimeData != null)
@@ -122,7 +126,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                         StartTime = HitObject.StartTime,
                         Samples = HitObject.Samples,
                         Duration = endTimeData.Duration,
-                        Column = GetColumn(positionData?.X ?? 0),
+                        Column = column,
                     });
                 }
                 else if (positionData != null)
@@ -131,7 +135,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
                     {
                         StartTime = HitObject.StartTime,
                         Samples = HitObject.Samples,
-                        Column = GetColumn(positionData?.X ?? 0)
+                        Column = column
                     });
                 }