clean up, removed references to missing classes