Cleaned up the service provider
CS fixes