housekeeping.  removed old objects from code