Remove unnecessary service provider