Cleanup xcore RPC interface

m8