Some HostFileSystem clean-up