cleaned references to old objects in various files