Simplified goroutine clean-up logic