Remove references to the old CHAP code.