Clean up Service Provider