Removed unnecessary classes and id's