code cleanup for new call retries