more object cleanup