Remove goroutines that lead to possible races