Taking out an unused class and an extraneous commented out piece of code. We weren't using that stuff anymore and it's better to not keep unused files around