Get rid of remoting