Removed function calls directly using IFileSystem singleton.