Merge pull request #1014 from riscv-collab/riscv-batch-cleanup

Merge pull request #1014 from riscv-collab/riscv-batch-cleanup #633