Removed save before close