Fix too much cleanup