Need to clean before packing to avoid lots of warnings