Update to latest CH and remove conflicting functions.