Fixed bug where after running out of retry attempts,
swapout was only doing the 'retry' version of cleanup,
when it should have been doing a full cleanup.