fixed bad cleanup