Cleanup + persistence fix