chore(services): cleanup service provider and remove 5.2 support
Merge pull request #7565 from mrclay/sp_cleanup

chore(services): cleanup service provider and remove 5.2 support