removed deprecated dispatch references and updated to rpc