Remove deprecated gathering component with manual filtering.