diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs.orig b/osu.Game.Modes.Osu/OsuRuleset.cs.orig
deleted file mode 100644
index 014b0cedab..0000000000
--- a/osu.Game.Modes.Osu/OsuRuleset.cs.orig
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using OpenTK.Input;
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.Osu.Objects;
-using osu.Game.Modes.Osu.UI;
-using osu.Game.Modes.UI;
-using osu.Game.Screens.Play;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace osu.Game.Modes.Osu
-{
-    public class OsuRuleset : Ruleset
-    {
-        public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new OsuHitRenderer
-        {
-            Beatmap = beatmap,
-        };
-
-        public override IEnumerable<BeatmapStatistic> GetBeatmapStatistics(WorkingBeatmap beatmap) => new[]
-        {
-            new BeatmapStatistic
-            {
-                Name = @"Circle count",
-                Content = beatmap.Beatmap.HitObjects.Count(h => h is HitCircle).ToString(),
-                Icon = FontAwesome.fa_dot_circle_o
-            },
-            new BeatmapStatistic
-            {
-                Name = @"Slider count",
-                Content = beatmap.Beatmap.HitObjects.Count(h => h is Slider).ToString(),
-                Icon = FontAwesome.fa_circle_o
-            }
-        };
-
-        public override IEnumerable<Mod> GetModsFor(ModType type)
-        {
-            switch (type)
-            {
-                case ModType.DifficultyReduction:
-                    return new Mod[]
-                    {
-                        new OsuModEasy(),
-                        new OsuModNoFail(),
-                        new OsuModHalfTime(),
-                    };
-
-                case ModType.DifficultyIncrease:
-                    return new Mod[]
-                    {
-                        new OsuModHardRock(),
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new OsuModSuddenDeath(),
-                                new OsuModPerfect(),
-                            },
-                        },
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new OsuModDoubleTime(),
-                                new OsuModNightcore(),
-                            },
-                        },
-                        new OsuModHidden(),
-                        new OsuModFlashlight(),
-                    };
-
-                case ModType.Special:
-                    return new Mod[]
-                    {
-                        new OsuModRelax(),
-                        new OsuModAutopilot(),
-                        new OsuModSpunOut(),
-                        new MultiMod
-                        {
-                            Mods = new Mod[]
-                            {
-                                new OsuModAutoplay(),
-                                new ModCinema(),
-                            },
-                        },
-                        new OsuModTarget(),
-                    };
-
-                default:
-                    return new Mod[] { };
-            }
-        }
-
-        public override FontAwesome Icon => FontAwesome.fa_osu_osu_o;
-
-        public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
-
-        public override ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0) => new OsuScoreProcessor(hitObjectCount);
-
-        public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new OsuDifficultyCalculator(beatmap);
-
-        public override Score CreateAutoplayScore(Beatmap beatmap)
-        {
-            var score = CreateScoreProcessor().GetScore();
-            score.Replay = new OsuAutoReplay(beatmap);
-            return score;
-        }
-
-        protected override PlayMode PlayMode => PlayMode.Osu;
-
-        public override string Description => "osu!";
-<<<<<<< HEAD
-        public override KeyCounter[] CreateGameplayKeys => new KeyCounter[]
-=======
-        public override KeyCounter[] GameplayKeys => new KeyCounter[]
->>>>>>> combocounter_bindable
-        {
-            new KeyCounterKeyboard(Key.Z),
-            new KeyCounterKeyboard(Key.X),
-            new KeyCounterMouse(MouseButton.Left),
-            new KeyCounterMouse(MouseButton.Right)
-        };
-    }
-}
diff --git a/osu.Game/Modes/Ruleset.cs.orig b/osu.Game/Modes/Ruleset.cs.orig
deleted file mode 100644
index 3b8d961029..0000000000
--- a/osu.Game/Modes/Ruleset.cs.orig
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Modes.Objects;
-using osu.Game.Modes.UI;
-using osu.Game.Screens.Play;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-
-namespace osu.Game.Modes
-{
-    public class BeatmapStatistic
-    {
-        public FontAwesome Icon;
-        public string Content;
-        public string Name;
-    }
-
-    public abstract class Ruleset
-    {
-        public abstract KeyCounter[] CreateGameplayKeys { get; }
-
-        private static ConcurrentDictionary<PlayMode, Type> availableRulesets = new ConcurrentDictionary<PlayMode, Type>();
-<<<<<<< HEAD
-
-        public static IEnumerable<PlayMode> PlayModes => availableRulesets.Keys;
-=======
-
-        public static IEnumerable<PlayMode> PlayModes => availableRulesets.Keys;
-
->>>>>>> combocounter_bindable
-
-        public virtual IEnumerable<BeatmapStatistic> GetBeatmapStatistics(WorkingBeatmap beatmap) => new BeatmapStatistic[] { };
-
-        public abstract IEnumerable<Mod> GetModsFor(ModType type);
-
-        public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0);
-
-        public abstract HitRenderer CreateHitRendererWith(Beatmap beatmap);
-
-        public abstract HitObjectParser CreateHitObjectParser();
-
-        public abstract DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap);
-
-        public static void Register(Ruleset ruleset) => availableRulesets.TryAdd(ruleset.PlayMode, ruleset.GetType());
-
-        protected abstract PlayMode PlayMode { get; }
-
-        public virtual FontAwesome Icon => FontAwesome.fa_question_circle;
-
-        public abstract string Description { get; }
-
-        public virtual Score CreateAutoplayScore(Beatmap beatmap) => null;
-
-        public static Ruleset GetRuleset(PlayMode mode)
-        {
-            Type type;
-
-            if (!availableRulesets.TryGetValue(mode, out type))
-                return null;
-
-            return Activator.CreateInstance(type) as Ruleset;
-        }
-
-    }
-}