F/persist cleanup