Removed unnecessary options fallbacks from save