Cleanup Provider, tweak doc