retryFrom code cleanup