Remove persist option, mock save instead