Alter flow of purging service

[Finishes #66686528]