- Remove some left-overs from the switch to dedicated header filters.