Move to use libclRpc