Removed unnecessary old classes and layouts.