Revert "Cleanup the deferral file after the queue has been emptied"

This reverts commit 4dfdf6a1031b387dfb11edde4a867553b6599b7e.