Cleanup singleFlight a bit
Remove stale comments