remove references to deprecated classes