service provider selection cleanup