Save/load clean up.