More removal of System.IO deps