removed old classes and added xmlid