More cleanup in providerHelper