clean up provider a bit