Clean up old classes and resharper issues