Remove save and quit mapping, Change save without quit to save and quit mapping