XD-1956: Moved deletion listener to be configured as a step listener instead of a job listener