Alter flow of purging service

This is related to https://www.pivotaltracker.com/story/show/63185416