Removed old classes and set for 2.1.2