cleanup provider a bit