Cleanup '_check_and_save'