Merge pull request #1238 from oczkers/master

cleanup (remove max_retries test)