Remove unnecessary savepoints