cleared ch9 stuff form the ch10 branch to avoid confusion