Refactor obsolete service to standard provider
Add comments & merge