restore backup fix, cleanup