Made use of new service in previously existing classes, removing the old logic

Ticket : GCP-10144
Reviewer : Jai Villarino