Cleaned up persistence
Cleaned up persistence