Addressing breaking IFileSystem changes

@pranavkm
@pranavkm. Removed the fileSystem and fixed the callers.