xxx fix bad cleanup