Tidy up providers. 
[skip ci]