Removing dependencies on IOUtils and FileUtils