Reduce down retry attempts to something more manageble
Removed unused variables