Clean up some code in the retry logic.