object generation cleanup, part 2