Refactor Batch: Remove