XD-1956: Moved deletion listener to be configured as a step listener ins...

...tead of a job listener