Removed constructor calls to HoyaFileSystem and passed instances around.