Refactors/simplifies remoting

/cc @mbebenita, @tobytailor