Remove old slow persist code