Fix encoding of bctrl, and remove some unused instructions