Increase retries, cleanup since we are re-using where possible