Remove extranious saving