Cleanup stuff

Thanks for reviewing @samarthgupta437 
I am trying to accomplish the same thing using library functions.
I ran NewRetryTest#testRetryInProcessZeroAttemptUpdate but I was not successful in exercising this part of the code.