Refactors/simplifies remoting