clean up some service providers