Removed legacy RPC's calling code