Fixing bad cleanup