ServiceProviderInterface cleanup