Remove persistence
Another attempt