Removal of dependency on System.IO