Rollback and cleanup