remove references to old classes