Removed a couple places that were talking to the file system directly