clean up some unused code
Merge branch 'RISCV' into hwacha