persistence cleanup work