Remove old service provider.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixes testcase.

Signed-off-by: crynobone <crynobone@gmail.com>