Remove dependance to service provider (bis)