Remove ServiceProviderInterface