Remove #did_save/update/load/delete until actually needed