Clean up service provider
Fix config calls