Tidy up remoting metadata