Cleaning up remotefs a little bit