Smell done

Saving before cleanup