deduplication of FileSystemService code