Remove dependency on IOUtil