Remove old header match code