Small refactoring to use remote instead of ipc.