Remove savepoints. Use batching