removed unneeded retries