Log retries, some cleanup