Remove additional provider remnants