Remove unordered funnel code and out-of-date comments