We have a lot of other references in here to FileInfo still... not sure if that's worth cleaning up now though, especially if a bunch of this code is about to get deleted